diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:24 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:24 +0100 |
| commit | 75f2ce033168ff435e72bf5bb615176d9930e77f (patch) | |
| tree | c0633f512d06c8c6638ed58df1b39f304ca9c724 /include/asm-x86/tsc.h | |
| parent | fc7250ab38346762c567813794b80ee6c57dfed6 (diff) | |
| download | talos-obmc-linux-75f2ce033168ff435e72bf5bb615176d9930e77f.tar.gz talos-obmc-linux-75f2ce033168ff435e72bf5bb615176d9930e77f.zip | |
x86: get_cycles() fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/tsc.h')
| -rw-r--r-- | include/asm-x86/tsc.h | 4 |
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) if (!cpu_has_tsc) return 0; #endif - -#if defined(CONFIG_X86_GENERIC) || defined(CONFIG_X86_TSC) rdtscll(ret); -#endif + return ret; } |
