From: "Rafael J. Wysocki" Signed-off-by: Rafael J. Wysocki Signed-off-by: Andrew Morton --- arch/x86_64/kernel/nmi.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN arch/x86_64/kernel/nmi.c~swsusp-fix-remaining-u32-vs-pm_message_t-confusion-2 arch/x86_64/kernel/nmi.c --- devel/arch/x86_64/kernel/nmi.c~swsusp-fix-remaining-u32-vs-pm_message_t-confusion-2 2005-07-28 12:15:41.000000000 -0700 +++ devel-akpm/arch/x86_64/kernel/nmi.c 2005-07-28 12:15:41.000000000 -0700 @@ -290,7 +290,7 @@ void enable_timer_nmi_watchdog(void) 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(); _