Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09a01c0c authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

arch,xtensa: Convert smp_mb__*() 



Xtensa SMP has compare-and-swap which is fully serializing, therefore
its exising smp_mb__{before,after}_clear_bit() appear unduly heavy.

Implement the new barriers as barrier().

Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-e9rqjxr1m1ejsob9p433kmji@git.kernel.org


Cc: Chris Zankel <chris@zankel.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-xtensa@linux-xtensa.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d00a5692

arch/xtensa/include/asm/atomic.h

+1 −6
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#ifdef __KERNEL__

#include <asm/processor.h>

#include <asm/cmpxchg.h>

#include <asm/barrier.h>



#define ATOMIC_INIT(i)	{ (i) }
@@ -387,12 +388,6 @@ static inline void atomic_set_mask(unsigned int mask, atomic_t *v) 
#endif

}



/* Atomic operations are already serializing */

#define smp_mb__before_atomic_dec()	barrier()

#define smp_mb__after_atomic_dec()	barrier()

#define smp_mb__before_atomic_inc()	barrier()

#define smp_mb__after_atomic_inc()	barrier()



#endif /* __KERNEL__ */



#endif /* _XTENSA_ATOMIC_H */

arch/xtensa/include/asm/barrier.h

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
#define rmb() barrier()

#define wmb() mb()



#define smp_mb__before_atomic()		barrier()

#define smp_mb__after_atomic()		barrier()



#include <asm-generic/barrier.h>



#endif /* _XTENSA_SYSTEM_H */

arch/xtensa/include/asm/bitops.h

+1 −3
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ 


#include <asm/processor.h>

#include <asm/byteorder.h>



#define smp_mb__before_clear_bit()	smp_mb()

#define smp_mb__after_clear_bit()	smp_mb()

#include <asm/barrier.h>



#include <asm-generic/bitops/non-atomic.h>