diff options
author | Pavel Machek <pavel@suse.cz> | 2005-04-16 18:25:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:31 -0400 |
commit | 0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb (patch) | |
tree | fab311f6e4cfa969630e008ce63e45554a96df07 /arch/x86_64/kernel/nmi.c | |
parent | e2d53566a757c8d12246d8daf8c5a2f21a0c4293 (diff) |
[PATCH] Fix u32 vs. pm_message_t in x86-64
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>
Diffstat (limited to 'arch/x86_64/kernel/nmi.c')
-rw-r--r-- | arch/x86_64/kernel/nmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||
249 | static int nmi_pm_active; /* nmi_active before suspend */ | 249 | static int nmi_pm_active; /* nmi_active before suspend */ |
250 | 250 | ||
251 | static int lapic_nmi_suspend(struct sys_device *dev, u32 state) | 251 | static 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(); |