UIO: Fix mapping of logical and virtual memory

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

diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index ace340524c01588e6c48921beb67169193d0679d..9ffb01c31c40a8c9083e9949d065a442a62f46b7 100644 (file)
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -67,12 +67,12 @@ static __cpuinit void check_tsc_warp(void)
 
                /*
                 * Be nice every now and then (and also check whether
-                * measurement is done [we also insert a 100 million
+                * measurement is done [we also insert a 10 million
                 * loops safety exit, so we dont lock up in case the
                 * TSC readout is totally broken]):
                 */
                if (unlikely(!(i & 7))) {
-                       if (now > end || i > 100000000)
+                       if (now > end || i > 10000000)
                                break;
                        cpu_relax();
                        touch_nmi_watchdog();
@@ -87,8 +87,10 @@ static __cpuinit void check_tsc_warp(void)
                        nr_warps++;
                        __raw_spin_unlock(&sync_lock);
                }
-
        }
+       WARN(!(now-start),
+               "Warning: zero tsc calibration delta: %Ld [max: %Ld]\n",
+                       now-start, end-start);
 }
 
 /*