aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86_64/kernel/apic.c2
-rw-r--r--arch/x86_64/kernel/i8259.c2
-rw-r--r--arch/x86_64/kernel/io_apic.c2
-rw-r--r--arch/x86_64/kernel/nmi.c2
-rw-r--r--arch/x86_64/kernel/time.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index 9826f03dc9a3..7e13545748e0 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -457,7 +457,7 @@ static struct {
457 unsigned int apic_thmr; 457 unsigned int apic_thmr;
458} apic_pm_state; 458} apic_pm_state;
459 459
460static int lapic_suspend(struct sys_device *dev, u32 state) 460static int lapic_suspend(struct sys_device *dev, pm_message_t state)
461{ 461{
462 unsigned long flags; 462 unsigned long flags;
463 463
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c
index d52701246010..7873d9ba8814 100644
--- a/arch/x86_64/kernel/i8259.c
+++ b/arch/x86_64/kernel/i8259.c
@@ -409,7 +409,7 @@ static int i8259A_resume(struct sys_device *dev)
409 return 0; 409 return 0;
410} 410}
411 411
412static int i8259A_suspend(struct sys_device *dev, u32 state) 412static int i8259A_suspend(struct sys_device *dev, pm_message_t state)
413{ 413{
414 save_ELCR(irq_trigger); 414 save_ELCR(irq_trigger);
415 return 0; 415 return 0;
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index adebe70c180e..29a257295484 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -1712,7 +1712,7 @@ struct sysfs_ioapic_data {
1712}; 1712};
1713static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS]; 1713static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS];
1714 1714
1715static int ioapic_suspend(struct sys_device *dev, u32 state) 1715static int ioapic_suspend(struct sys_device *dev, pm_message_t state)
1716{ 1716{
1717 struct IO_APIC_route_entry *entry; 1717 struct IO_APIC_route_entry *entry;
1718 struct sysfs_ioapic_data *data; 1718 struct sysfs_ioapic_data *data;
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 72f40ca4f06b..e00d4adec36b 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -248,7 +248,7 @@ void enable_timer_nmi_watchdog(void)
248 248
249static int nmi_pm_active; /* nmi_active before suspend */ 249static int nmi_pm_active; /* nmi_active before suspend */
250 250
251static int lapic_nmi_suspend(struct sys_device *dev, u32 state) 251static int lapic_nmi_suspend(struct sys_device *dev, pm_message_t state)
252{ 252{
253 nmi_pm_active = nmi_active; 253 nmi_pm_active = nmi_active;
254 disable_lapic_nmi_watchdog(); 254 disable_lapic_nmi_watchdog();
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index 943a9bfba209..0e3b60e1ac5b 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -965,7 +965,7 @@ __setup("report_lost_ticks", time_setup);
965static long clock_cmos_diff; 965static long clock_cmos_diff;
966static unsigned long sleep_start; 966static unsigned long sleep_start;
967 967
968static int timer_suspend(struct sys_device *dev, u32 state) 968static int timer_suspend(struct sys_device *dev, pm_message_t state)
969{ 969{
970 /* 970 /*
971 * Estimate time zone so that set_time can update the clock 971 * Estimate time zone so that set_time can update the clock