diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 18:25:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:24 -0400 |
commit | 438510f6f079e94df294936b5bd8a7fd679cd1c9 (patch) | |
tree | 9c26a3eb527e95ed19e74d2c1d58e46f2d6908df /arch/i386/kernel/nmi.c | |
parent | 74ad74c1581c9a27582945ca01ffdb88fc774171 (diff) |
[PATCH] pm_message_t: more fixes in common and i386
I thought I'm done with fixing u32 vs. pm_message_t ... unfortunately
that turned out not to be the case as Russel King pointed out. Here are
fixes for Documentation and common code (mainly system devices).
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/i386/kernel/nmi.c')
-rw-r--r-- | arch/i386/kernel/nmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index f5b0c5081bd6..2f89d000f954 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c | |||
@@ -265,7 +265,7 @@ void enable_timer_nmi_watchdog(void) | |||
265 | 265 | ||
266 | static int nmi_pm_active; /* nmi_active before suspend */ | 266 | static int nmi_pm_active; /* nmi_active before suspend */ |
267 | 267 | ||
268 | static int lapic_nmi_suspend(struct sys_device *dev, u32 state) | 268 | static int lapic_nmi_suspend(struct sys_device *dev, pm_message_t state) |
269 | { | 269 | { |
270 | nmi_pm_active = nmi_active; | 270 | nmi_pm_active = nmi_active; |
271 | disable_lapic_nmi_watchdog(); | 271 | disable_lapic_nmi_watchdog(); |