Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking updates from Ingo Molnar: "The locking tree was busier in this cycle than the usual pattern - a couple of major projects happened to coincide. The main changes are: - implement the atomic_fetch_{add,sub,and,or,xor}() API natively across all SMP architectures (Peter Zijlstra) - add atomic_fetch_{inc/dec}() as well, using the generic primitives (Davidlohr Bueso) - optimize various aspects of rwsems (Jason Low, Davidlohr Bueso, Waiman Long) - optimize smp_cond_load_acquire() on arm64 and implement LSE based atomic{,64}_fetch_{add,sub,and,andnot,or,xor}{,_relaxed,_acquire,_release}() on arm64 (Will Deacon) - introduce smp_acquire__after_ctrl_dep() and fix various barrier mis-uses and bugs (Peter Zijlstra) - after discovering ancient spin_unlock_wait() barrier bugs in its implementation and usage, strengthen its semantics and update/fix usage sites (Peter Zijlstra) - optimize mutex_trylock() fastpath (Peter Zijlstra) - ... misc fixes and cleanups" * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (67 commits) locking/atomic: Introduce inc/dec variants for the atomic_fetch_$op() API locking/barriers, arch/arm64: Implement LDXR+WFE based smp_cond_load_acquire() locking/static_keys: Fix non static symbol Sparse warning locking/qspinlock: Use __this_cpu_dec() instead of full-blown this_cpu_dec() locking/atomic, arch/tile: Fix tilepro build locking/atomic, arch/m68k: Remove comment locking/atomic, arch/arc: Fix build locking/Documentation: Clarify limited control-dependency scope locking/atomic, arch/rwsem: Employ atomic_long_fetch_add() locking/atomic, arch/qrwlock: Employ atomic_fetch_add_acquire() locking/atomic, arch/mips: Convert to _relaxed atomics locking/atomic, arch/alpha: Convert to _relaxed atomics locking/atomic: Remove the deprecated atomic_{set,clear}_mask() functions locking/atomic: Remove linux/atomic.h:atomic_fetch_or() locking/atomic: Implement atomic{,64,_long}_fetch_{add,sub,and,andnot,or,xor}{,_relaxed,_acquire,_release}() locking/atomic: Fix atomic64_relaxed() bits locking/atomic, arch/xtensa: Implement atomic_fetch_{add,sub,and,or,xor}() locking/atomic, arch/x86: Implement atomic{,64}_fetch_{add,sub,and,or,xor}() locking/atomic, arch/tile: Implement atomic{,64}_fetch_{add,sub,and,or,xor}() locking/atomic, arch/sparc: Implement atomic{,64}_fetch_{add,sub,and,or,xor}() ...
Showing
- Documentation/memory-barriers.txt 41 additions, 0 deletionsDocumentation/memory-barriers.txt
- MAINTAINERS 12 additions, 4 deletionsMAINTAINERS
- arch/alpha/include/asm/atomic.h 72 additions, 15 deletionsarch/alpha/include/asm/atomic.h
- arch/alpha/include/asm/rwsem.h 13 additions, 55 deletionsarch/alpha/include/asm/rwsem.h
- arch/alpha/include/asm/spinlock.h 7 additions, 2 deletionsarch/alpha/include/asm/spinlock.h
- arch/arc/include/asm/atomic.h 87 additions, 12 deletionsarch/arc/include/asm/atomic.h
- arch/arc/include/asm/spinlock.h 5 additions, 2 deletionsarch/arc/include/asm/spinlock.h
- arch/arm/include/asm/atomic.h 96 additions, 10 deletionsarch/arm/include/asm/atomic.h
- arch/arm/include/asm/spinlock.h 17 additions, 2 deletionsarch/arm/include/asm/spinlock.h
- arch/arm64/include/asm/atomic.h 60 additions, 0 deletionsarch/arm64/include/asm/atomic.h
- arch/arm64/include/asm/atomic_ll_sc.h 86 additions, 24 deletionsarch/arm64/include/asm/atomic_ll_sc.h
- arch/arm64/include/asm/atomic_lse.h 196 additions, 82 deletionsarch/arm64/include/asm/atomic_lse.h
- arch/arm64/include/asm/barrier.h 13 additions, 0 deletionsarch/arm64/include/asm/barrier.h
- arch/arm64/include/asm/cmpxchg.h 51 additions, 0 deletionsarch/arm64/include/asm/cmpxchg.h
- arch/avr32/include/asm/atomic.h 49 additions, 5 deletionsarch/avr32/include/asm/atomic.h
- arch/blackfin/include/asm/atomic.h 8 additions, 0 deletionsarch/blackfin/include/asm/atomic.h
- arch/blackfin/include/asm/spinlock.h 3 additions, 2 deletionsarch/blackfin/include/asm/spinlock.h
- arch/blackfin/kernel/bfin_ksyms.c 1 addition, 0 deletionsarch/blackfin/kernel/bfin_ksyms.c
- arch/blackfin/mach-bf561/atomic.S 31 additions, 12 deletionsarch/blackfin/mach-bf561/atomic.S
- arch/frv/include/asm/atomic.h 10 additions, 20 deletionsarch/frv/include/asm/atomic.h
Please register or sign in to comment