diff options
| author | OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> | 2007-12-03 17:17:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2007-12-03 17:17:10 +0100 |
| commit | 0c1b2724069951b1902373e688042b2ec382f68f (patch) | |
| tree | f7c82b24a50c7445e3d43d11b8a47b466bc2897d /arch | |
| parent | c86c7fbc829e27e2a4093f98ded9fbd75e515adb (diff) | |
| download | blackbird-op-linux-0c1b2724069951b1902373e688042b2ec382f68f.tar.gz blackbird-op-linux-0c1b2724069951b1902373e688042b2ec382f68f.zip | |
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 @@ #include <asm/nmi.h> #include <asm/hw_irq.h> #include <asm/apic.h> +#include <asm/hpet.h> #include <linux/kdebug.h> #include <asm/smp.h> @@ -140,5 +141,8 @@ void machine_crash_shutdown(struct pt_regs *regs) #if defined(CONFIG_X86_IO_APIC) disable_IO_APIC(); #endif +#ifdef CONFIG_HPET_TIMER + hpet_disable(); +#endif crash_save_cpu(regs, safe_smp_processor_id()); } |
