diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-21 09:45:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-21 09:45:19 +0200 |
| commit | 94edf6f3c20c9c8ee301bde04150a91bab4bf32c (patch) | |
| tree | 4a2af658258cf42fde24c1224e44c3e6a18c2792 /arch/parisc/include | |
| parent | d5da6457bfadf64ff78f1816ae8329dbbba19513 (diff) | |
| parent | 656e7c0c0a2e8d899f87fd7f081ea7a711146604 (diff) | |
| download | linux-94edf6f3c20c9c8ee301bde04150a91bab4bf32c.tar.bz2 | |
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/parisc/include')
| -rw-r--r-- | arch/parisc/include/asm/spinlock.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/asm/spinlock.h index e32936cd7f10..55bfe4affca3 100644 --- a/arch/parisc/include/asm/spinlock.h +++ b/arch/parisc/include/asm/spinlock.h @@ -14,13 +14,6 @@ static inline int arch_spin_is_locked(arch_spinlock_t *x) #define arch_spin_lock(lock) arch_spin_lock_flags(lock, 0) -static inline void arch_spin_unlock_wait(arch_spinlock_t *x) -{ - volatile unsigned int *a = __ldcw_align(x); - - smp_cond_load_acquire(a, VAL); -} - static inline void arch_spin_lock_flags(arch_spinlock_t *x, unsigned long flags) { |