Move source tree closer to the 2.6.32.17 mainline
/arch/x86/include/asm/system.h
blob:f08f973748922b26a2417ed70db47fec2b54b009 -> blob:e0fbf294536c6e96cb7b0169cd263cfe1bd8133d
--- arch/x86/include/asm/system.h
+++ arch/x86/include/asm/system.h
@@ -449,7 +449,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);