Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ffbe7d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull core locking changes from Ingo Molnar:
 - futex performance increases: larger hashes, smarter wakeups
 - mutex debugging improvements
 - lots of SMP ordering documentation updates
 - introduce the smp_load_acquire(), smp_store_release() primitives.
   (There are WIP patches that make use of them - not yet merged)
 - lockdep micro-optimizations
 - lockdep improvement: better cover IRQ contexts
 - liblockdep at last. We'll continue to monitor how useful this is

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (34 commits)
  futexes: Fix futex_hashsize initialization
  arch: Re-sort some Kbuild files to hopefully help avoid some conflicts
  futexes: Avoid taking the hb->lock if there's nothing to wake up
  futexes: Document multiprocessor ordering guarantees
  futexes: Increase hash table size for better performance
  futexes: Clean up various details
  arch: Introduce smp_load_acquire(), smp_store_release()
  arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h
  arch: Move smp_mb__{before,after}_atomic_{inc,dec}.h into asm/atomic.h
  locking/doc: Rename LOCK/UNLOCK to ACQUIRE/RELEASE
  mutexes: Give more informative mutex warning in the !lock->owner case
  powerpc: Full barrier for smp_mb__after_unlock_lock()
  rcu: Apply smp_mb__after_unlock_lock() to preserve grace periods
  Documentation/memory-barriers.txt: Downgrade UNLOCK+BLOCK
  locking: Add an smp_mb__after_unlock_lock() for UNLOCK+BLOCK barrier
  Documentation/memory-barriers.txt: Document ACCESS_ONCE()
  Documentation/memory-barriers.txt: Prohibit speculative writes
  Documentation/memory-barriers.txt: Add long atomic examples to memory-barriers.txt
  Documentation/memory-barriers.txt: Add needed ACCESS_ONCE() calls to memory-barriers.txt
  Revert "smp/cpumask: Make CONFIG_CPUMASK_OFFSTACK=y usable without debug dependency"
  ...
parents 897aea30 63b1a816

Documentation/memory-barriers.txt

+716 −206

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/robust-futex-ABI.txt

+2 −2
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ On removal: 
 1) set the 'list_op_pending' word to the address of the 'lock entry'

    to be removed,

 2) remove the lock entry for this lock from the 'head' list,

 2) release the futex lock, and

 2) clear the 'lock_op_pending' word.

 3) release the futex lock, and

 4) clear the 'lock_op_pending' word.



On exit, the kernel will consider the address stored in

'list_op_pending' and the address of each 'lock word' found by walking

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -5141,6 +5141,11 @@ F: drivers/lguest/ 
F:	include/linux/lguest*.h

F:	tools/lguest/



LIBLOCKDEP

M:	Sasha Levin <sasha.levin@oracle.com>

S:	Maintained

F:	tools/lib/lockdep/



LINUX FOR IBM pSERIES (RS/6000)

M:	Paul Mackerras <paulus@au.ibm.com>

W:	http://www.ibm.com/linux/ltc/projects/ppc

arch/alpha/include/asm/barrier.h

+5 −20
Original line number Diff line number Diff line
@@ -3,33 +3,18 @@ 


#include <asm/compiler.h>



#define mb() \

__asm__ __volatile__("mb": : :"memory")

#define mb()	__asm__ __volatile__("mb": : :"memory")

#define rmb()	__asm__ __volatile__("mb": : :"memory")

#define wmb()	__asm__ __volatile__("wmb": : :"memory")



#define rmb() \

__asm__ __volatile__("mb": : :"memory")



#define wmb() \

__asm__ __volatile__("wmb": : :"memory")



#define read_barrier_depends() \

__asm__ __volatile__("mb": : :"memory")

#define read_barrier_depends() __asm__ __volatile__("mb": : :"memory")



#ifdef CONFIG_SMP

#define __ASM_SMP_MB	"\tmb\n"

#define smp_mb()	mb()

#define smp_rmb()	rmb()

#define smp_wmb()	wmb()

#define smp_read_barrier_depends()	read_barrier_depends()

#else

#define __ASM_SMP_MB

#define smp_mb()	barrier()

#define smp_rmb()	barrier()

#define smp_wmb()	barrier()

#define smp_read_barrier_depends()	do { } while (0)

#endif



#define set_mb(var, value) \

do { var = value; mb(); } while (0)

#include <asm-generic/barrier.h>



#endif		/* __BARRIER_H */

arch/arc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
generic-y += auxvec.h

generic-y += barrier.h

generic-y += bugs.h

generic-y += bitsperlong.h

generic-y += clkdev.h