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 | |
| parent | x86/lib/clear_page_64.S: Convert to ALTERNATIVE_2 macro (diff) | |
| download | linux-c70e1b475f37f07ab7181ad28458666d59aae634.tar.xz linux-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')
| -rw-r--r-- | arch/x86/include/asm/barrier.h | 6 | ||||
| -rw-r--r-- | arch/x86/um/asm/barrier.h | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index 2ab1eb33106e..959e45b81fe2 100644 --- a/arch/x86/include/asm/barrier.h +++ b/arch/x86/include/asm/barrier.h @@ -95,13 +95,11 @@ do { \ * Stop RDTSC speculation. This is needed when you need to use RDTSC * (or get_cycles or vread that possibly accesses the TSC) in a defined * code region. - * - * (Could use an alternative three way for this if there was one.) */ static __always_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 /* _ASM_X86_BARRIER_H */ 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 |