Merge tag 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[sfrench/cifs-2.6.git] / arch / x86 / um / asm / barrier.h

diff --git a/arch/x86/um/asm/barrier.h b/arch/x86/um/asm/barrier.h
index aec75a5d8722c29df0ee25a7f3d35349a3bb6cfb..7e8a1a6504356159bd1b604b53de4ed194ddd19c 100644 (file)
--- a/arch/x86/um/asm/barrier.h
+++ b/arch/x86/um/asm/barrier.h
@@ -53,8 +53,8 @@
  */
 static inline void rdtsc_barrier(void)
 {
-       alternative(ASM_NOP3, "mfence", X86_FEATURE_MFENCE_RDTSC);
-       alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC);
+       alternative_2("", "mfence", X86_FEATURE_MFENCE_RDTSC,
+                         "lfence", X86_FEATURE_LFENCE_RDTSC);
 }
 
 #endif