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/sparc | |
| 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/sparc')
| -rw-r--r-- | arch/sparc/include/asm/spinlock_32.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/sparc/include/asm/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h index 8011e79f59c9..67345b2dc408 100644 --- a/arch/sparc/include/asm/spinlock_32.h +++ b/arch/sparc/include/asm/spinlock_32.h | |||
| @@ -14,11 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #define arch_spin_is_locked(lock) (*((volatile unsigned char *)(lock)) != 0) | 15 | #define arch_spin_is_locked(lock) (*((volatile unsigned char *)(lock)) != 0) |
| 16 | 16 | ||
| 17 | static inline void arch_spin_unlock_wait(arch_spinlock_t *lock) | ||
| 18 | { | ||
| 19 | smp_cond_load_acquire(&lock->lock, !VAL); | ||
| 20 | } | ||
| 21 | |||
| 22 | static inline void arch_spin_lock(arch_spinlock_t *lock) | 17 | static inline void arch_spin_lock(arch_spinlock_t *lock) |
| 23 | { | 18 | { |
| 24 | __asm__ __volatile__( | 19 | __asm__ __volatile__( |