x86: disable hpet legacy replacement for kdump
authorOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Mon, 3 Dec 2007 16:17:10 +0000 (17:17 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 3 Dec 2007 16:17:10 +0000 (17:17 +0100)
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>
arch/x86/kernel/crash.c

index 8bb482ff091b8eeaf54287cce060c664e5bf4046..9a5fa0abfcc7d3e63aa0c0a39ce786b29397b727 100644 (file)
@@ -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>
 
@@ -139,6 +140,9 @@ void machine_crash_shutdown(struct pt_regs *regs)
        lapic_shutdown();
 #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());
 }