diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:24 -0700 |
commit | 438510f6f079e94df294936b5bd8a7fd679cd1c9 (patch) | |
tree | 9c26a3eb527e95ed19e74d2c1d58e46f2d6908df /arch/i386/kernel/nmi.c | |
parent | 74ad74c1581c9a27582945ca01ffdb88fc774171 (diff) | |
download | kernel_samsung_espresso10-438510f6f079e94df294936b5bd8a7fd679cd1c9.zip kernel_samsung_espresso10-438510f6f079e94df294936b5bd8a7fd679cd1c9.tar.gz kernel_samsung_espresso10-438510f6f079e94df294936b5bd8a7fd679cd1c9.tar.bz2 |
[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 f5b0c50..2f89d00 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c @@ -265,7 +265,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(); |