vserver 2.0 rc7

[linux-2.6.git] / include / asm-i386 / timex.h

diff --git a/include/asm-i386/timex.h b/include/asm-i386/timex.h
index e737729..b41e484 100644 (file)
--- a/include/asm-i386/timex.h
+++ b/include/asm-i386/timex.h
@@ -7,7 +7,7 @@
 #define _ASMi386_TIMEX_H
 
 #include <linux/config.h>
-#include <asm/msr.h>
+#include <asm/processor.h>
 
 #ifdef CONFIG_X86_ELAN
 #  define CLOCK_TICK_RATE 1189200 /* AMD Elan has different frequency! */
@@ -15,10 +15,6 @@
 #  define CLOCK_TICK_RATE 1193182 /* Underlying HZ */
 #endif
 
-#define CLOCK_TICK_FACTOR      20      /* Factor of both 1000000 and CLOCK_TICK_RATE */
-#define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \
-       (1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \
-               << (SHIFT_SCALE-SHIFT_HZ)) / HZ)
 
 /*
  * Standard way to access the cycle counter on i586+ CPUs.
@@ -36,18 +32,19 @@
  */
 typedef unsigned long long cycles_t;
 
-extern cycles_t cacheflush_time;
-
 static inline cycles_t get_cycles (void)
 {
+       unsigned long long ret=0;
+
 #ifndef CONFIG_X86_TSC
-       return 0;
-#else
-       unsigned long long ret;
+       if (!cpu_has_tsc)
+               return 0;
+#endif
 
+#if defined(CONFIG_X86_GENERIC) || defined(CONFIG_X86_TSC)
        rdtscll(ret);
-       return ret;
 #endif
+       return ret;
 }
 
 extern unsigned long cpu_khz;