---

yaml --- r: 74544 b: refs/heads/master c: 0c1b272 h: refs/heads/master v: v3
git-mirror · Dec 3, 2007 · 2ee926c · 2ee926c
1 parent 67fc979
commit 2ee926c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c86c7fbc829e27e2a4093f98ded9fbd75e515adb
+refs/heads/master: 0c1b2724069951b1902373e688042b2ec382f68f
diff --git a/trunk/arch/x86/kernel/crash.c b/trunk/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());
 }