Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz...

[karo-tx-linux.git] / arch / x86 / kernel / tsc.c

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index eee465109e1641da80102e36cfe60eea3c7c939b..2c9cf0fd78f59a66d1c802d26a4956319f1b9c1b 100644 (file)
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -178,11 +178,11 @@ static unsigned long calc_pmtimer_ref(u64 deltatsc, u64 pm1, u64 pm2)
 }
 
 #define CAL_MS         10
-#define CAL_LATCH      (CLOCK_TICK_RATE / (1000 / CAL_MS))
+#define CAL_LATCH      (PIT_TICK_RATE / (1000 / CAL_MS))
 #define CAL_PIT_LOOPS  1000
 
 #define CAL2_MS                50
-#define CAL2_LATCH     (CLOCK_TICK_RATE / (1000 / CAL2_MS))
+#define CAL2_LATCH     (PIT_TICK_RATE / (1000 / CAL2_MS))
 #define CAL2_PIT_LOOPS 5000