Skip to content

Commit 1bc6787

Browse files
suryasaimadhuingomolnar
authored andcommitted
x86/asm: Simplify __smp_mb() definition
Drop the bitness ifdeffery in favor of using _ASM_SP, which is the helper macro for the rSP register specification for 32 and 64 bit depending on the build. No functional changes. Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Ingo Molnar <mingo@kernel.org> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/20210512093310.5635-1-bp@alien8.de
1 parent 64e1f58 commit 1bc6787

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

arch/x86/include/asm/barrier.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,8 @@ static inline unsigned long array_index_mask_nospec(unsigned long index,
5454
#define dma_rmb() barrier()
5555
#define dma_wmb() barrier()
5656

57-
#ifdef CONFIG_X86_32
58-
#define __smp_mb() asm volatile("lock; addl $0,-4(%%esp)" ::: "memory", "cc")
59-
#else
60-
#define __smp_mb() asm volatile("lock; addl $0,-4(%%rsp)" ::: "memory", "cc")
61-
#endif
57+
#define __smp_mb() asm volatile("lock; addl $0,-4(%%" _ASM_SP ")" ::: "memory", "cc")
58+
6259
#define __smp_rmb() dma_rmb()
6360
#define __smp_wmb() barrier()
6461
#define __smp_store_mb(var, value) do { (void)xchg(&var, value); } while (0)

0 commit comments

Comments
 (0)