git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-x86_64
/
timex.h
diff --git
a/include/asm-x86_64/timex.h
b/include/asm-x86_64/timex.h
index
f18443f
..
b9e5320
100644
(file)
--- a/
include/asm-x86_64/timex.h
+++ b/
include/asm-x86_64/timex.h
@@
-33,7
+33,7
@@
static __always_inline cycles_t get_cycles_sync(void)
unsigned eax;
/* Don't do an additional sync on CPUs where we know
RDTSC is already synchronous. */
unsigned eax;
/* Don't do an additional sync on CPUs where we know
RDTSC is already synchronous. */
- alternative_io(
ASM_NOP2, "cpuid"
, X86_FEATURE_SYNC_RDTSC,
+ alternative_io(
"cpuid", ASM_NOP2
, X86_FEATURE_SYNC_RDTSC,
"=a" (eax), "0" (1) : "ebx","ecx","edx","memory");
rdtscll(ret);
return ret;
"=a" (eax), "0" (1) : "ebx","ecx","edx","memory");
rdtscll(ret);
return ret;