aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-01-30 07:33:24 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:24 -0500
commit75f2ce033168ff435e72bf5bb615176d9930e77f (patch)
treec0633f512d06c8c6638ed58df1b39f304ca9c724
parentfc7250ab38346762c567813794b80ee6c57dfed6 (diff)
x86: get_cycles() fix
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--include/asm-x86/tsc.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-x86/tsc.h b/include/asm-x86/tsc.h
index a6e8d35c3f86..7d3e27f7d484 100644
--- a/include/asm-x86/tsc.h
+++ b/include/asm-x86/tsc.h
@@ -27,10 +27,8 @@ static inline cycles_t get_cycles(void)
27 if (!cpu_has_tsc) 27 if (!cpu_has_tsc)
28 return 0; 28 return 0;
29#endif 29#endif
30
31#if defined(CONFIG_X86_GENERIC) || defined(CONFIG_X86_TSC)
32 rdtscll(ret); 30 rdtscll(ret);
33#endif 31
34 return ret; 32 return ret;
35} 33}
36 34