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

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

arch,powerpc: Convert smp_mb__*() 



Powerpc allows reordering over its ll/sc implementation. Implement the
two new barriers as appropriate.

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-gg2ffgq32sjgy9b8lj6m3hsc@git.kernel.org


Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-kernel@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e4a65e9d

arch/powerpc/include/asm/atomic.h

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

#include <linux/types.h>

#include <asm/cmpxchg.h>

#include <asm/barrier.h>



#define ATOMIC_INIT(i)		{ (i) }
@@ -270,11 +271,6 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v) 
}

#define atomic_dec_if_positive atomic_dec_if_positive



#define smp_mb__before_atomic_dec()     smp_mb()

#define smp_mb__after_atomic_dec()      smp_mb()

#define smp_mb__before_atomic_inc()     smp_mb()

#define smp_mb__after_atomic_inc()      smp_mb()



#ifdef __powerpc64__



#define ATOMIC64_INIT(i)	{ (i) }

arch/powerpc/include/asm/barrier.h

+3 −0
Original line number Diff line number Diff line
@@ -84,4 +84,7 @@ do { \ 
	___p1;								\

})



#define smp_mb__before_atomic()     smp_mb()

#define smp_mb__after_atomic()      smp_mb()



#endif /* _ASM_POWERPC_BARRIER_H */

arch/powerpc/include/asm/bitops.h

+1 −5
Original line number Diff line number Diff line
@@ -51,11 +51,7 @@ 
#define PPC_BIT(bit)		(1UL << PPC_BITLSHIFT(bit))

#define PPC_BITMASK(bs, be)	((PPC_BIT(bs) - PPC_BIT(be)) | PPC_BIT(bs))



/*

 * clear_bit doesn't imply a memory barrier

 */

#define smp_mb__before_clear_bit()	smp_mb()

#define smp_mb__after_clear_bit()	smp_mb()

#include <asm/barrier.h>



/* Macro for generating the ***_bits() functions */

#define DEFINE_BITOP(fn, op, prefix)		\

arch/powerpc/kernel/crash.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ void crash_ipi_callback(struct pt_regs *regs) 
	}



	atomic_inc(&cpus_in_crash);

	smp_mb__after_atomic_inc();

	smp_mb__after_atomic();



	/*

	 * Starting the kdump boot.