Davidlohr Bueso
dave****@stgol*****
2016年 4月 19日 (火) 15:30:21 JST
(1) We no longer have smp_mb_{before,after}_clear_bit(), and should be using the _atomic suffix. (2) By not defining smp_mb__{before,after} calls, h8300 will default to smp_mb, but since the arch is !SMP will be a compiler barrier anyway. Based on the above, rename the calls. Signed-off-by: Davidlohr Bueso <dbues****@suse*****> --- arch/h8300/include/asm/bitops.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/h8300/include/asm/bitops.h b/arch/h8300/include/asm/bitops.h index 05999aba1d6a..842f785977e4 100644 --- a/arch/h8300/include/asm/bitops.h +++ b/arch/h8300/include/asm/bitops.h @@ -53,8 +53,8 @@ static inline void FNAME(int nr, volatile unsigned long *addr) \ /* * clear_bit() doesn't provide any barrier for the compiler. */ -#define smp_mb__before_clear_bit() barrier() -#define smp_mb__after_clear_bit() barrier() +#define smp_mb__before_atomic() barrier() +#define smp_mb__after_atomic() barrier() H8300_GEN_BITOP(set_bit, "bset") H8300_GEN_BITOP(clear_bit, "bclr") -- 2.8.1