diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-21 03:45:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-21 03:45:19 -0400 |
commit | 94edf6f3c20c9c8ee301bde04150a91bab4bf32c (patch) | |
tree | 4a2af658258cf42fde24c1224e44c3e6a18c2792 /arch/m32r/include/asm/spinlock.h | |
parent | d5da6457bfadf64ff78f1816ae8329dbbba19513 (diff) | |
parent | 656e7c0c0a2e8d899f87fd7f081ea7a711146604 (diff) |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney:
- Removal of spin_unlock_wait()
- SRCU updates
- Torture-test updates
- Documentation updates
- Miscellaneous fixes
- CPU-hotplug fixes
- Miscellaneous non-RCU fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m32r/include/asm/spinlock.h')
-rw-r--r-- | arch/m32r/include/asm/spinlock.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/m32r/include/asm/spinlock.h b/arch/m32r/include/asm/spinlock.h index 323c7fc953cd..a56825592b90 100644 --- a/arch/m32r/include/asm/spinlock.h +++ b/arch/m32r/include/asm/spinlock.h | |||
@@ -30,11 +30,6 @@ | |||
30 | #define arch_spin_is_locked(x) (*(volatile int *)(&(x)->slock) <= 0) | 30 | #define arch_spin_is_locked(x) (*(volatile int *)(&(x)->slock) <= 0) |
31 | #define arch_spin_lock_flags(lock, flags) arch_spin_lock(lock) | 31 | #define arch_spin_lock_flags(lock, flags) arch_spin_lock(lock) |
32 | 32 | ||
33 | static inline void arch_spin_unlock_wait(arch_spinlock_t *lock) | ||
34 | { | ||
35 | smp_cond_load_acquire(&lock->slock, VAL > 0); | ||
36 | } | ||
37 | |||
38 | /** | 33 | /** |
39 | * arch_spin_trylock - Try spin lock and return a result | 34 | * arch_spin_trylock - Try spin lock and return a result |
40 | * @lock: Pointer to the lock variable | 35 | * @lock: Pointer to the lock variable |