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;