x86: disable hpet on shutdown

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / reboot_64.c

diff --git a/arch/x86/kernel/reboot_64.c b/arch/x86/kernel/reboot_64.c
index 71b13c5f5817dd0d1ffbe2285fe003c11e6ea088..53620a92a8fdd74cc2885d28d65eaa7eb34d89d1 100644 (file)
--- a/arch/x86/kernel/reboot_64.c
+++ b/arch/x86/kernel/reboot_64.c
@@ -17,6 +17,7 @@
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <asm/apic.h>
+#include <asm/hpet.h>
 #include <asm/gart.h>
 
 /*
@@ -113,6 +114,9 @@ void machine_shutdown(void)
 
        disable_IO_APIC();
 
+#ifdef CONFIG_HPET_TIMER
+       hpet_disable();
+#endif
        local_irq_restore(flags);
 
        pci_iommu_shutdown();