From deb30d4b7c144e1a1fc8be4172042af9630716f3 Mon Sep 17 00:00:00 2001
From: "Siddha, Suresh B" <suresh.b.siddha@intel.com>
Date: Tue, 11 Apr 2006 12:54:42 +0200
Subject: [PATCH] --- yaml --- r: 25621 b: refs/heads/master c:
 e4cff6ac78e9c3bbb90c0e01b20418eeae0c6b52 h: refs/heads/master i:   25619:
 6ffa75c2f5baf4a0ed7540162c1484ce194b61bd v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-x86_64/timex.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b8b4c05f5cae..45dc5d2719b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97a4d00388db4f0bfa37425b31d7d9751ea649db
+refs/heads/master: e4cff6ac78e9c3bbb90c0e01b20418eeae0c6b52
diff --git a/trunk/include/asm-x86_64/timex.h b/trunk/include/asm-x86_64/timex.h
index f18443fcdf04..b9e5320b7625 100644
--- a/trunk/include/asm-x86_64/timex.h
+++ b/trunk/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;