[POWERPC] tidy spinlock.h a bit
From: Stephen Rothwell <hidden>
Date: 2007-02-23 03:40:59
_raw_{spin,read,write}relax() are not used anywhere, so remove them.
The calls to __spin_yield() and __rw_yield() will only be compiled in
if CONFIG_PPC_SPLPAR or CONFIG_PPC_ISERIES is defined, so we don't need
alternate definitions for them (just declarations).
Signed-off-by: Stephen Rothwell <redacted>
---
include/asm-powerpc/spinlock.h | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --git a/include/asm-powerpc/spinlock.h b/include/asm-powerpc/spinlock.h
index cc4cfce..e247503 100644
--- a/include/asm-powerpc/spinlock.h
+++ b/include/asm-powerpc/spinlock.h@@ -95,13 +95,11 @@ static int __inline__ __raw_spin_trylock(raw_spinlock_t *lock) #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES) /* We only yield to the hypervisor if we are in shared processor mode */ #define SHARED_PROCESSOR (get_lppaca()->shared_proc) -extern void __spin_yield(raw_spinlock_t *lock); -extern void __rw_yield(raw_rwlock_t *lock); #else /* SPLPAR || ISERIES */ -#define __spin_yield(x) barrier() -#define __rw_yield(x) barrier() #define SHARED_PROCESSOR 0 #endif +extern void __spin_yield(raw_spinlock_t *lock); +extern void __rw_yield(raw_rwlock_t *lock); static void __inline__ __raw_spin_lock(raw_spinlock_t *lock) {
@@ -285,9 +283,5 @@ static __inline__ void __raw_write_unlock(raw_rwlock_t *rw) rw->lock = 0; } -#define _raw_spin_relax(lock) __spin_yield(lock) -#define _raw_read_relax(lock) __rw_yield(lock) -#define _raw_write_relax(lock) __rw_yield(lock) - #endif /* __KERNEL__ */ #endif /* __ASM_SPINLOCK_H */
--
1.4.4.4