Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=75f2ce033168ff435e72bf5bb615176d9930e77f Commit: 75f2ce033168ff435e72bf5bb615176d9930e77f Parent: fc7250ab38346762c567813794b80ee6c57dfed6 Author: Ingo Molnar <[EMAIL PROTECTED]> AuthorDate: Wed Jan 30 13:33:24 2008 +0100 Committer: Ingo Molnar <[EMAIL PROTECTED]> CommitDate: Wed Jan 30 13:33:24 2008 +0100
x86: get_cycles() fix Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]> Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]> --- 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 a6e8d35..7d3e27f 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; } - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html