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

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

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

Pull locking changes from Ingo Molnar:
 "Various updates:

   - Futex scalability improvements: remove page lock use for shared
     futex get_futex_key(), which speeds up 'perf bench futex hash'
     benchmarks by over 40% on a 60-core Westmere.  This makes anon-mem
     shared futexes perform close to private futexes.  (Mel Gorman)

   - lockdep hash collision detection and fix (Alfredo Alvarez
     Fernandez)

   - lockdep testing enhancements (Alfredo Alvarez Fernandez)

   - robustify lockdep init by using hlists (Andrew Morton, Andrey
     Ryabinin)

   - mutex and csd_lock micro-optimizations (Davidlohr Bueso)

   - small x86 barriers tweaks (Michael S Tsirkin)

   - qspinlock updates (Waiman Long)"

* 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (25 commits)
  locking/csd_lock: Use smp_cond_acquire() in csd_lock_wait()
  locking/csd_lock: Explicitly inline csd_lock*() helpers
  futex: Replace barrier() in unqueue_me() with READ_ONCE()
  locking/lockdep: Detect chain_key collisions
  locking/lockdep: Prevent chain_key collisions
  tools/lib/lockdep: Fix link creation warning
  tools/lib/lockdep: Add tests for AA and ABBA locking
  tools/lib/lockdep: Add userspace version of READ_ONCE()
  tools/lib/lockdep: Fix the build on recent kernels
  locking/qspinlock: Move __ARCH_SPIN_LOCK_UNLOCKED to qspinlock_types.h
  locking/mutex: Allow next waiter lockless wakeup
  locking/pvqspinlock: Enable slowpath locking count tracking
  locking/qspinlock: Use smp_cond_acquire() in pending code
  locking/pvqspinlock: Move lock stealing count tracking code into pv_queued_spin_steal_lock()
  locking/mcs: Fix mcs_spin_lock() ordering
  futex: Remove requirement for lock_page() in get_futex_key()
  futex: Rename barrier references in ordering guarantees
  locking/atomics: Update comment about READ_ONCE() and structures
  locking/lockdep: Eliminate lockdep_init()
  locking/lockdep: Convert hash tables to hlists
  ...
parents d37a14bb 38460a21

arch/c6x/kernel/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -281,8 +281,6 @@ notrace void __init machine_init(unsigned long dt_ptr) 
	 */

	set_ist(_vectors_start);



	lockdep_init();



	/*

	 * dtb is passed in from bootloader.

	 * fdt is linked in blob.

arch/microblaze/kernel/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -130,8 +130,6 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, 
	memset(__bss_start, 0, __bss_stop-__bss_start);

	memset(_ssbss, 0, _esbss-_ssbss);



	lockdep_init();



/* initialize device tree for usage in early_printk */

	early_init_devtree(_fdt_start);

arch/powerpc/kernel/setup_32.c

+0 −2
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ extern unsigned int memset_nocache_branch; /* Insn to be replaced by NOP */ 


notrace void __init machine_init(u64 dt_ptr)

{

	lockdep_init();



	/* Enable early debugging if any specified (see udbg.h) */

	udbg_early_init();

arch/powerpc/kernel/setup_64.c

+0 −3
Original line number Diff line number Diff line
@@ -255,9 +255,6 @@ void __init early_setup(unsigned long dt_ptr) 
	setup_paca(&boot_paca);

	fixup_boot_paca();



	/* Initialize lockdep early or else spinlocks will blow */

	lockdep_init();



	/* -------- printk is now safe to use ------- */



	/* Enable early debugging if any specified (see udbg.h) */

arch/s390/kernel/early.c

+0 −1
Original line number Diff line number Diff line
@@ -448,7 +448,6 @@ void __init startup_init(void) 
	rescue_initrd();

	clear_bss_section();

	init_kernel_storage_key();

	lockdep_init();

	lockdep_off();

	setup_lowcore_early();

	setup_facility_list();