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

Commit 462bf234 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 updates from Ingo Molnar:
 "The biggest change is the MCS spinlock generalization changes from Tim
  Chen, Peter Zijlstra, Jason Low et al.  There's also lockdep
  fixes/enhancements from Oleg Nesterov, in particular a false negative
  fix related to lockdep_set_novalidate_class() usage"

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (22 commits)
  locking/mutex: Fix debug checks
  locking/mutexes: Add extra reschedule point
  locking/mutexes: Introduce cancelable MCS lock for adaptive spinning
  locking/mutexes: Unlock the mutex without the wait_lock
  locking/mutexes: Modify the way optimistic spinners are queued
  locking/mutexes: Return false if task need_resched() in mutex_can_spin_on_owner()
  locking: Move mcs_spinlock.h into kernel/locking/
  m68k: Skip futex_atomic_cmpxchg_inatomic() test
  futex: Allow architectures to skip futex_atomic_cmpxchg_inatomic() test
  Revert "sched/wait: Suppress Sparse 'variable shadowing' warning"
  lockdep: Change lockdep_set_novalidate_class() to use _and_name
  lockdep: Change mark_held_locks() to check hlock->check instead of lockdep_no_validate
  lockdep: Don't create the wrong dependency on hlock->check == 0
  lockdep: Make held_lock->check and "int check" argument bool
  locking/mcs: Allow architecture specific asm files to be used for contended case
  locking/mcs: Order the header files in Kbuild of each architecture in alphabetical order
  sched/wait: Suppress Sparse 'variable shadowing' warning
  hung_task/Documentation: Fix hung_task_warnings description
  locking/mcs: Allow architectures to hook in to contended paths
  locking/mcs: Micro-optimize the MCS code, add extra comments
  ...
parents 455c6fdb 6f008e72

Documentation/sysctl/kernel.txt

+3 −2
Original line number Diff line number Diff line
@@ -320,10 +320,11 @@ This file shows up if CONFIG_DETECT_HUNG_TASK is enabled. 


==============================================================



hung_task_warning:

hung_task_warnings:



The maximum number of warnings to report. During a check interval

When this value is reached, no more the warnings will be reported.

if a hung task is detected, this value is decreased by 1.

When this value reaches 0, no more warnings will be reported.

This file shows up if CONFIG_DETECT_HUNG_TASK is enabled.



-1: report an infinite number of warnings.

arch/alpha/include/asm/Kbuild

+4 −3
Original line number Diff line number Diff line 


generic-y += clkdev.h



generic-y += clkdev.h

generic-y += exec.h

generic-y += trace_clock.h

generic-y += preempt.h

generic-y += hash.h

generic-y += mcs_spinlock.h

generic-y += preempt.h

generic-y += trace_clock.h

arch/arc/include/asm/Kbuild

+4 −3
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 += bugs.h

generic-y += clkdev.h

generic-y += cputime.h

generic-y += device.h

generic-y += div64.h

generic-y += emergency-restart.h

generic-y += errno.h

generic-y += fcntl.h

generic-y += fb.h

generic-y += fcntl.h

generic-y += ftrace.h

generic-y += hardirq.h

generic-y += hash.h
@@ -22,6 +22,7 @@ generic-y += kmap_types.h 
generic-y += kvm_para.h

generic-y += local.h

generic-y += local64.h

generic-y += mcs_spinlock.h

generic-y += mman.h

generic-y += msgbuf.h

generic-y += param.h
@@ -30,6 +31,7 @@ generic-y += pci.h 
generic-y += percpu.h

generic-y += poll.h

generic-y += posix_types.h

generic-y += preempt.h

generic-y += resource.h

generic-y += scatterlist.h

generic-y += sembuf.h
@@ -48,4 +50,3 @@ generic-y += ucontext.h 
generic-y += user.h

generic-y += vga.h

generic-y += xor.h
 
generic-y += preempt.h

arch/arm/include/asm/Kbuild

+3 −2
Original line number Diff line number Diff line
@@ -7,16 +7,19 @@ generic-y += current.h 
generic-y += emergency-restart.h

generic-y += errno.h

generic-y += exec.h

generic-y += hash.h

generic-y += ioctl.h

generic-y += ipcbuf.h

generic-y += irq_regs.h

generic-y += kdebug.h

generic-y += local.h

generic-y += local64.h

generic-y += mcs_spinlock.h

generic-y += msgbuf.h

generic-y += param.h

generic-y += parport.h

generic-y += poll.h

generic-y += preempt.h

generic-y += resource.h

generic-y += sections.h

generic-y += segment.h
@@ -33,5 +36,3 @@ generic-y += termios.h 
generic-y += timex.h

generic-y += trace_clock.h

generic-y += unaligned.h
 
generic-y += preempt.h

generic-y += hash.h

arch/arm64/include/asm/Kbuild

+4 −3
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ generic-y += dma.h 
generic-y += emergency-restart.h

generic-y += errno.h

generic-y += ftrace.h

generic-y += hash.h

generic-y += hw_irq.h

generic-y += ioctl.h

generic-y += ioctls.h
@@ -22,12 +23,14 @@ generic-y += kmap_types.h 
generic-y += kvm_para.h

generic-y += local.h

generic-y += local64.h

generic-y += mcs_spinlock.h

generic-y += mman.h

generic-y += msgbuf.h

generic-y += mutex.h

generic-y += pci.h

generic-y += poll.h

generic-y += posix_types.h

generic-y += preempt.h

generic-y += resource.h

generic-y += scatterlist.h

generic-y += sections.h
@@ -38,8 +41,8 @@ generic-y += shmbuf.h 
generic-y += sizes.h

generic-y += socket.h

generic-y += sockios.h

generic-y += switch_to.h

generic-y += swab.h

generic-y += switch_to.h

generic-y += termbits.h

generic-y += termios.h

generic-y += topology.h
@@ -49,5 +52,3 @@ generic-y += unaligned.h 
generic-y += user.h

generic-y += vga.h

generic-y += xor.h
 
generic-y += preempt.h

generic-y += hash.h