projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fc7250a
)
x86: get_cycles() fix
author
Ingo Molnar
<mingo@elte.hu>
Wed, 30 Jan 2008 12:33:24 +0000
(13:33 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 30 Jan 2008 12:33:24 +0000
(13:33 +0100)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/asm-x86/tsc.h
patch
|
blob
|
blame
|
history
diff --git
a/include/asm-x86/tsc.h
b/include/asm-x86/tsc.h
index a6e8d35c3f86775e0c8ef24acd781e795234cf9c..7d3e27f7d484d8ce848951b4f0b48a4d285242c0 100644
(file)
--- 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;
}