---

yaml --- r: 80155 b: refs/heads/master c: f06e4ec h: refs/heads/master i: 80153: 68d6e72 80151: c14d98f v: v3
git-mirror · Jan 30, 2008 · aecc6fb · aecc6fb
1 parent 410dd40
commit aecc6fb
Show file tree

Hide file tree

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