---

yaml --- r: 200590 b: refs/heads/master c: 1244829 h: refs/heads/master v: v3
git-mirror · Jun 18, 2010 · 3fbbf92 · 3fbbf92
1 parent c76be11
commit 3fbbf92
Show file tree

Hide file tree

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