diff options
| author |   Borislav Petkov <bp@suse.de> | 2015-01-18 15:19:55 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2015-02-23 13:44:17 +0100 |
| commit | c70e1b475f37f07ab7181ad28458666d59aae634 (patch) | |
| tree | 4f044d42d853c17dc1552adcd210815a6e06eca6 /arch/x86/um | |
| parent | x86/lib/clear_page_64.S: Convert to ALTERNATIVE_2 macro (diff) | |
| download | linux-dev-c70e1b475f37f07ab7181ad28458666d59aae634.tar.xz linux-dev-c70e1b475f37f07ab7181ad28458666d59aae634.zip | |
x86/asm: Use alternative_2() in rdtsc_barrier()
... now that we have it.
Acked-by: Andy Lutomirski <luto@amacapital.net>
Cc: Richard Weinberger <richard@nod.at>
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/um')
| -rw-r--r-- | arch/x86/um/asm/barrier.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/um/asm/barrier.h b/arch/x86/um/asm/barrier.h index 2d7d9a1f5b53..8ffd2146fa6a 100644 --- a/arch/x86/um/asm/barrier.h +++ b/arch/x86/um/asm/barrier.h @@ -64,8 +64,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 |