Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / include / asm-x86 / tsc.h

diff --git a/include/asm-x86/tsc.h b/include/asm-x86/tsc.h
index a6e8d35c3f86775e0c8ef24acd781e795234cf9c..0434bd8349a7456f27f8ca95c18b472e07c1ba8e 100644 (file)
--- a/include/asm-x86/tsc.h
+++ b/include/asm-x86/tsc.h
@@ -18,6 +18,7 @@ extern unsigned int cpu_khz;
 extern unsigned int tsc_khz;
 
 extern void disable_TSC(void);
+extern void enable_TSC(void);
 
 static inline cycles_t get_cycles(void)
 {
@@ -27,10 +28,8 @@ static inline cycles_t get_cycles(void)
        if (!cpu_has_tsc)
                return 0;
 #endif
-
-#if defined(CONFIG_X86_GENERIC) || defined(CONFIG_X86_TSC)
        rdtscll(ret);
-#endif
+
        return ret;
 }
 
@@ -44,7 +43,7 @@ static inline cycles_t vget_cycles(void)
        if (!cpu_has_tsc)
                return 0;
 #endif
-       return (cycles_t) __native_read_tsc();
+       return (cycles_t)__native_read_tsc();
 }
 
 extern void tsc_init(void);