Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

[linux-2.6] / arch / x86 / kernel / tsc_sync.c

diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index 7110078f242cd39ad76d0c8c554214f42ada36b7..0577825cf89bad5ecdac456fa13d12f4b8e2fa0e 100644 (file)
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -87,7 +87,11 @@ static __cpuinit void check_tsc_warp(void)
                        nr_warps++;
                        __raw_spin_unlock(&sync_lock);
                }
-
+       }
+       if (!(now-start)) {
+               printk("Warning: zero tsc calibration delta: %Ld [max: %Ld]\n",
+                       now-start, end-start);
+               WARN_ON(1);
        }
 }