From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Date: Mon, 3 Dec 2007 16:17:10 +0000 (+0100)
Subject: x86: disable hpet legacy replacement for kdump
X-Git-Tag: v2.6.24-rc4~3^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c1b2724069951b1902373e688042b2ec382f68f;p=linux-2.6

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>
---

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 8bb482ff09..9a5fa0abfc 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>
 
@@ -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());
 }