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

Commit d0571909 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull locking fixes from Thomas Gleixner:
 "The locking department delivers:

   - A rather large and intrusive bundle of fixes to address serious
     performance regressions introduced by the new rwsem / mcs
     technology.  Simpler solutions have been discussed, but they would
     have been ugly bandaids with more risk than doing the right thing.

   - Make the rwsem spin on owner technology opt-in for architectures
     and enable it only on the known to work ones.

   - A few fixes to the lockdep userspace library"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/rwsem: Add CONFIG_RWSEM_SPIN_ON_OWNER
  locking/mutex: Disable optimistic spinning on some architectures
  locking/rwsem: Reduce the size of struct rw_semaphore
  locking/rwsem: Rename 'activity' to 'count'
  locking/spinlocks/mcs: Micro-optimize osq_unlock()
  locking/spinlocks/mcs: Introduce and use init macro and function for osq locks
  locking/spinlocks/mcs: Convert osq lock to atomic_t to reduce overhead
  locking/spinlocks/mcs: Rename optimistic_spin_queue() to optimistic_spin_node()
  locking/rwsem: Allow conservative optimistic spinning when readers have lock
  tools/liblockdep: Account for bitfield changes in lockdeps lock_acquire
  tools/liblockdep: Remove debug print left over from development
  tools/liblockdep: Fix comparison of a boolean value with a value of 2
parents d1743b81 9de8033f

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config ARM 
	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_WANT_IPC_PARSE_VERSION

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config ARM64 
	select ARCH_HAS_OPP

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION

	select ARCH_WANT_FRAME_POINTERS

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ config PPC 
	select HAVE_IRQ_EXIT_ON_IRQ_STACK

	select ARCH_USE_CMPXCHG_LOCKREF if PPC64

	select HAVE_ARCH_AUDITSYSCALL

	select ARCH_SUPPORTS_ATOMIC_RMW



config GENERIC_CSUM

	def_bool CPU_LITTLE_ENDIAN

arch/sparc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ config SPARC64 
	select HAVE_C_RECORDMCOUNT

	select NO_BOOTMEM

	select HAVE_ARCH_AUDITSYSCALL

	select ARCH_SUPPORTS_ATOMIC_RMW



config ARCH_DEFCONFIG

	string

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ config X86 
	select HAVE_CC_STACKPROTECTOR

	select GENERIC_CPU_AUTOPROBE

	select HAVE_ARCH_AUDITSYSCALL

	select ARCH_SUPPORTS_ATOMIC_RMW



config INSTRUCTION_DECODER

	def_bool y