From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 30 Jan 2008 12:33:24 +0000 (+0100)
Subject: x86: get_cycles() fix
X-Git-Tag: v2.6.25-rc1~1143^2~215
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=75f2ce033168ff435e72bf5bb615176d9930e77f;p=linux-2.6-omap-h63xx.git

x86: get_cycles() fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/include/asm-x86/tsc.h b/include/asm-x86/tsc.h
index a6e8d35c3f8..7d3e27f7d48 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;
 }