---

yaml --- r: 25621 b: refs/heads/master c: e4cff6a h: refs/heads/master i: 25619: 6ffa75c v: v3
git-mirror · Apr 11, 2006 · deb30d4 · deb30d4
1 parent 59d2a2f
commit deb30d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;