diff options
| author | Pavel Machek <pavel@suse.cz> | 2005-04-17 00:25:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 00:25:31 +0200 |
| commit | 0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb (patch) | |
| tree | fab311f6e4cfa969630e008ce63e45554a96df07 /arch/x86_64/kernel/nmi.c | |
| parent | [PATCH] fix pm_message_t vs. u32 in alsa (diff) | |
| download | linux-0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb.tar.xz linux-0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb.zip | |
[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) 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(); |