From aecc6fbe526b2516b65a6b01678b7b3f86bd7b2e Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 30 Jan 2008 13:32:39 +0100
Subject: [PATCH] --- yaml --- r: 80155 b: refs/heads/master c:
 f06e4ec1c15691b0cfd2397ae32214fa36c90d71 h: refs/heads/master i:   80153:
 68d6e72b3cc0a54d5fddb6d9e4e06dec0ee4ce7f   80151:
 c14d98f06f67ffe7c07ace4dc4d2493a79af2f65 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/kernel/rtc.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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);