summaryrefslogtreecommitdiff
path: root/include/asm-x86_64
diff options
context:
space:
mode:
authorSiddha, Suresh B <suresh.b.siddha@intel.com>2006-04-11 12:54:42 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 06:38:57 -0700
commite4cff6ac78e9c3bbb90c0e01b20418eeae0c6b52 (patch)
tree8238a3c16227089250de19a6ab0fc0a8ec939b36 /include/asm-x86_64
parent97a4d00388db4f0bfa37425b31d7d9751ea649db (diff)
downloadlinux-next-e4cff6ac78e9c3bbb90c0e01b20418eeae0c6b52.tar.gz
[PATCH] x86_64: fix sync before RDTSC on Intel cpus
Commit c818a18146997d1356a4840b0c01f1168c16c8a4 didn't do the expected thing. This fix will remove the additional sync(cpuid) before RDTSC on Intel platforms.. Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r--include/asm-x86_64/timex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/timex.h b/include/asm-x86_64/timex.h
index f18443fcdf04..b9e5320b7625 100644
--- 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. */
- 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;