Fix u32 vs. pm_message_t in x86-64
Hi!
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. [These patches are independend and change no object code; therefore not numbered].
Please apply,
Signed-off-by Pavel Machek <[email protected]>
Pavel
arch/x86_64/kernel/apic.c +1 -1
@@ -457,7 +457,7 @@unsigned int apic_thmr; } 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;
arch/x86_64/kernel/i8259.c +1 -1
@@ -409,7 +409,7 @@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);return 0 ;
arch/x86_64/kernel/io_apic.c +1 -1
@@ -1712,7 +1712,7 @@ };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 sysfs_ioapic_data *data;
arch/x86_64/kernel/nmi.c +1 -1
@@ -254,7 +254,7 @@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;disable_lapic_nmi_watchdog ();
arch/x86_64/kernel/time.c +1 -1
@@ -957,7 +957,7 @@static long clock_cmos_diff;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
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!