diff options
author | OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> | 2007-12-03 11:17:10 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2007-12-03 11:17:10 -0500 |
commit | 0c1b2724069951b1902373e688042b2ec382f68f (patch) | |
tree | f7c82b24a50c7445e3d43d11b8a47b466bc2897d /arch | |
parent | c86c7fbc829e27e2a4093f98ded9fbd75e515adb (diff) |
x86: disable hpet legacy replacement for kdump
we should also add hpet_disable() for kdump.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/crash.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 8bb482ff091b..9a5fa0abfcc7 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <asm/nmi.h> | 22 | #include <asm/nmi.h> |
23 | #include <asm/hw_irq.h> | 23 | #include <asm/hw_irq.h> |
24 | #include <asm/apic.h> | 24 | #include <asm/apic.h> |
25 | #include <asm/hpet.h> | ||
25 | #include <linux/kdebug.h> | 26 | #include <linux/kdebug.h> |
26 | #include <asm/smp.h> | 27 | #include <asm/smp.h> |
27 | 28 | ||
@@ -140,5 +141,8 @@ void machine_crash_shutdown(struct pt_regs *regs) | |||
140 | #if defined(CONFIG_X86_IO_APIC) | 141 | #if defined(CONFIG_X86_IO_APIC) |
141 | disable_IO_APIC(); | 142 | disable_IO_APIC(); |
142 | #endif | 143 | #endif |
144 | #ifdef CONFIG_HPET_TIMER | ||
145 | hpet_disable(); | ||
146 | #endif | ||
143 | crash_save_cpu(regs, safe_smp_processor_id()); | 147 | crash_save_cpu(regs, safe_smp_processor_id()); |
144 | } | 148 | } |