lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] Fix u32 vs. pm_message_t in x86-64

Browse Source 
I thought I'm done with fixing u32 vs.  pm_message_t ...  unfortunately that
turned out not to be the case...  Here are fixes x86-64.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Pavel Machek
2005-04-16 15:25:31 -07:00
committed by Linus Torvalds
parent e2d53566a7
commit 0b9c33a7d6
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86_64/kernel/apic.c
View File

@@ -457,7 +457,7 @@ static struct {
unsigned int apic_thmr; unsigned int apic_thmr;
} apic_pm_state; } apic_pm_state;
static int lapic_suspend(struct sys_device *dev, u32 state) static int lapic_suspend(struct sys_device *dev, pm_message_t state)
{ {
unsigned long flags; unsigned long flags;

2
arch/x86_64/kernel/i8259.c
View File

@@ -409,7 +409,7 @@ static int i8259A_resume(struct sys_device *dev)
return 0; return 0;
} }
static int i8259A_suspend(struct sys_device *dev, u32 state) static int i8259A_suspend(struct sys_device *dev, pm_message_t state)
{ {
save_ELCR(irq_trigger); save_ELCR(irq_trigger);
return 0; return 0;

2
arch/x86_64/kernel/io_apic.c
View File

@@ -1712,7 +1712,7 @@ struct sysfs_ioapic_data {
}; };
static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS]; static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS];
static int ioapic_suspend(struct sys_device *dev, u32 state) static int ioapic_suspend(struct sys_device *dev, pm_message_t state)
{ {
struct IO_APIC_route_entry *entry; struct IO_APIC_route_entry *entry;
struct sysfs_ioapic_data *data; struct sysfs_ioapic_data *data;

2
arch/x86_64/kernel/nmi.c
View File

@@ -248,7 +248,7 @@ void enable_timer_nmi_watchdog(void)
static int nmi_pm_active; /* nmi_active before suspend */ static int nmi_pm_active; /* nmi_active before suspend */
static int lapic_nmi_suspend(struct sys_device *dev, u32 state) static int lapic_nmi_suspend(struct sys_device *dev, pm_message_t state)
{ {
nmi_pm_active = nmi_active; nmi_pm_active = nmi_active;
disable_lapic_nmi_watchdog(); disable_lapic_nmi_watchdog();

2
arch/x86_64/kernel/time.c
View File

@@ -965,7 +965,7 @@ __setup("report_lost_ticks", time_setup);
static long clock_cmos_diff; static long clock_cmos_diff;
static unsigned long sleep_start; static unsigned long sleep_start;
static int timer_suspend(struct sys_device *dev, u32 state) static int timer_suspend(struct sys_device *dev, pm_message_t state)
{ {
/* /*
* Estimate time zone so that set_time can update the clock * Estimate time zone so that set_time can update the clock