From 3fbbf92fdd0435e91a9e70345d3b0a3c2a16b94b Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Fri, 18 Jun 2010 23:09:00 +0200
Subject: [PATCH] --- yaml --- r: 200590 b: refs/heads/master c:
 124482935fb7fb9303c8a8ab930149c6a93d9910 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/include/asm/system.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8c2a34bfab77..8e1350beda28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a4f3b523779b67e7d560ed42652f8a59f2f9782
+refs/heads/master: 124482935fb7fb9303c8a8ab930149c6a93d9910
diff --git a/trunk/arch/x86/include/asm/system.h b/trunk/arch/x86/include/asm/system.h
index b8fe48ee2ed9..e7f4d33c55ed 100644
--- a/trunk/arch/x86/include/asm/system.h
+++ b/trunk/arch/x86/include/asm/system.h
@@ -451,7 +451,7 @@ void stop_this_cpu(void *dummy);
  *
  * (Could use an alternative three way for this if there was one.)
  */
-static inline void rdtsc_barrier(void)
+static __always_inline void rdtsc_barrier(void)
 {
 	alternative(ASM_NOP3, "mfence", X86_FEATURE_MFENCE_RDTSC);
 	alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC);