diff --git a/[refs] b/[refs] index 1a406dec4705..010c49007661 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4026440130b84101f2da7f5a0c7a3b046173d3c +refs/heads/master: f06e4ec1c15691b0cfd2397ae32214fa36c90d71 diff --git a/trunk/arch/x86/kernel/rtc.c b/trunk/arch/x86/kernel/rtc.c index c42cf1263882..276cb7073ab1 100644 --- a/trunk/arch/x86/kernel/rtc.c +++ b/trunk/arch/x86/kernel/rtc.c @@ -200,7 +200,10 @@ unsigned long long __vsyscall_fn native_read_tsc(void) { DECLARE_ARGS(val, low, high); + rdtsc_barrier(); asm volatile("rdtsc" : EAX_EDX_RET(val, low, high)); + rdtsc_barrier(); + return EAX_EDX_VAL(val, low, high); } EXPORT_SYMBOL_GPL(native_read_tsc);