aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2014-01-15 02:14:29 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-01-27 22:45:44 -0500
commit7179ba52889bef7e5e23f72908270e1ab2b7fc6f (patch)
tree4904e3a0268095e0242b29adc782708a7729ccc8
parent3405d230b374b6923878b21b8d708d7db1f734ef (diff)
powerpc: Implement arch_spin_is_locked() using arch_spin_value_unlocked()
At a glance these are just the inverse of each other. The one subtlety is that arch_spin_value_unlocked() takes the lock by value, rather than as a pointer, which is important for the lockref code. On the other hand arch_spin_is_locked() doesn't really care, so implement it in terms of arch_spin_value_unlocked(). Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/include/asm/spinlock.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
index 5162f8cd18c0..a30ef6999d66 100644
--- a/arch/powerpc/include/asm/spinlock.h
+++ b/arch/powerpc/include/asm/spinlock.h
@@ -28,8 +28,6 @@
28#include <asm/synch.h> 28#include <asm/synch.h>
29#include <asm/ppc-opcode.h> 29#include <asm/ppc-opcode.h>
30 30
31#define arch_spin_is_locked(x) ((x)->slock != 0)
32
33#ifdef CONFIG_PPC64 31#ifdef CONFIG_PPC64
34/* use 0x800000yy when locked, where yy == CPU number */ 32/* use 0x800000yy when locked, where yy == CPU number */
35#ifdef __BIG_ENDIAN__ 33#ifdef __BIG_ENDIAN__
@@ -59,6 +57,11 @@ static __always_inline int arch_spin_value_unlocked(arch_spinlock_t lock)
59 return lock.slock == 0; 57 return lock.slock == 0;
60} 58}
61 59
60static inline int arch_spin_is_locked(arch_spinlock_t *lock)
61{
62 return !arch_spin_value_unlocked(*lock);
63}
64
62/* 65/*
63 * This returns the old value in the lock, so we succeeded 66 * This returns the old value in the lock, so we succeeded
64 * in getting the lock if the return value is 0. 67 * in getting the lock if the return value is 0.