diff --git a/[refs] b/[refs] index f0487d441cc8..ffc3808a00c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc7250ab38346762c567813794b80ee6c57dfed6 +refs/heads/master: 75f2ce033168ff435e72bf5bb615176d9930e77f diff --git a/trunk/include/asm-x86/tsc.h b/trunk/include/asm-x86/tsc.h index a6e8d35c3f86..7d3e27f7d484 100644 --- a/trunk/include/asm-x86/tsc.h +++ b/trunk/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; }