2 files changed, 25 insertions, 0 deletions

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index cbcf72cde956..20d4dbc42e6e 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -470,6 +470,19 @@ void __init setup_boot_APIC_clock(void)
 
         local_apic_timer_verify_ok = 1;
 
+        /*
+         * Do a sanity check on the APIC calibration result
+         */
+        if (calibration_result < (1000000 / HZ)) {
+                local_irq_enable();
+                printk(KERN_WARNING
+                       "APIC frequency too slow, disabling apic timer\n");
+                /* No broadcast on UP ! */
+                if (num_possible_cpus() > 1)
+                        setup_APIC_timer();
+                return;
+        }
+
         /* We trust the pm timer based calibration */
         if (!pm_referenced) {
                 apic_printk(APIC_VERBOSE, "... verify APIC timer\n");
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index d1a696673d9d..731b48660fc4 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -384,6 +384,18 @@ void __init setup_boot_APIC_clock(void)
         calibrate_APIC_clock();
 
         /*
+         * Do a sanity check on the APIC calibration result
+         */
+        if (calibration_result < (1000000 / HZ)) {
+                printk(KERN_WARNING
+                       "APIC frequency too slow, disabling apic timer\n");
+                /* No broadcast on UP ! */
+                if (num_possible_cpus() > 1)
+                        setup_APIC_timer();
+                return;
+        }
+
+        /*
          * If nmi_watchdog is set to IO_APIC, we need the
          * PIT/HPET going.  Otherwise register lapic as a dummy
          * device.