Commit 2bf3604c authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Michael Ellerman
Browse files

powerpc/spinlock: Define smp_mb__after_spinlock only once 



Instead of both queued and simple spinlocks doing it. Move
it into the arch's spinlock.h.

Signed-off-by: default avatarDavidlohr Bueso <dbueso@suse.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210309015950.27688-2-dave@stgolabs.net
parent 93c043e3

arch/powerpc/include/asm/qspinlock.h

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ static __always_inline void queued_spin_lock(struct qspinlock *lock) 
}

#define queued_spin_lock queued_spin_lock



#define smp_mb__after_spinlock()   smp_mb()



static __always_inline int queued_spin_is_locked(struct qspinlock *lock)

{

	/*

arch/powerpc/include/asm/simple_spinlock.h

+0 −3
Original line number Diff line number Diff line
@@ -282,7 +282,4 @@ static inline void arch_write_unlock(arch_rwlock_t *rw) 
#define arch_read_relax(lock)	rw_yield(lock)

#define arch_write_relax(lock)	rw_yield(lock)



/* See include/linux/spinlock.h */

#define smp_mb__after_spinlock()   smp_mb()



#endif /* _ASM_POWERPC_SIMPLE_SPINLOCK_H */

arch/powerpc/include/asm/spinlock.h

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ 
#include <asm/simple_spinlock.h>

#endif



/* See include/linux/spinlock.h */

#define smp_mb__after_spinlock()	smp_mb()



#ifndef CONFIG_PARAVIRT_SPINLOCKS

static inline void pv_spinlocks_init(void) { }

#endif