Browse Source

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>
OGAWA Hirofumi 17 years ago
parent
commit
0c1b272406
1 changed files with 4 additions and 0 deletions
  1. 4 0
      arch/x86/kernel/crash.c

+ 4 - 0
arch/x86/kernel/crash.c

@@ -22,6 +22,7 @@
 #include <asm/nmi.h>
 #include <asm/nmi.h>
 #include <asm/hw_irq.h>
 #include <asm/hw_irq.h>
 #include <asm/apic.h>
 #include <asm/apic.h>
+#include <asm/hpet.h>
 #include <linux/kdebug.h>
 #include <linux/kdebug.h>
 #include <asm/smp.h>
 #include <asm/smp.h>
 
 
@@ -139,6 +140,9 @@ void machine_crash_shutdown(struct pt_regs *regs)
 	lapic_shutdown();
 	lapic_shutdown();
 #if defined(CONFIG_X86_IO_APIC)
 #if defined(CONFIG_X86_IO_APIC)
 	disable_IO_APIC();
 	disable_IO_APIC();
+#endif
+#ifdef CONFIG_HPET_TIMER
+	hpet_disable();
 #endif
 #endif
 	crash_save_cpu(regs, safe_smp_processor_id());
 	crash_save_cpu(regs, safe_smp_processor_id());
 }
 }