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

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  mutex: Fix missing conditions to build mutex_spin_on_owner()
  mutex: Better control mutex adaptive spinning config
  locking, task_struct: Reduce size on TRACE_IRQFLAGS and 64bit
  locking: Use __[SPIN|RW]_LOCK_UNLOCKED in [spin|rw]_lock_init()
  locking: Remove unused prototype
  locking: Reduce ifdefs in kernel/spinlock.c
  locking: Make inlining decision Kconfig based

diff --combined init/Kconfig
index eb4b33725db114984f4a967119a59e9892b225c3,06863dd7bf49b903c5b7a15ec99a913898df7c52..2e9a1457132cdbcd7cc3911a4d0db4e07a897e21
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -606,7 -606,7 +606,7 @@@ config SYSFS_DEPRECATE
        bool
  
  config SYSFS_DEPRECATED_V2
 -      bool "remove sysfs features which may confuse old userspace tools"
 +      bool "enable deprecated sysfs features which may confuse old userspace tools"
        depends on SYSFS
        default n
        select SYSFS_DEPRECATED
@@@ -1098,16 -1098,6 +1098,16 @@@ config SLOW_WOR
  
          See Documentation/slow-work.txt.
  
 +config SLOW_WORK_DEBUG
 +      bool "Slow work debugging through debugfs"
 +      default n
 +      depends on SLOW_WORK && DEBUG_FS
 +      help
 +        Display the contents of the slow work run queue through debugfs,
 +        including items currently executing.
 +
 +        See Documentation/slow-work.txt.
 +
  endmenu               # General setup
  
  config HAVE_GENERIC_DMA_COHERENT
@@@ -1220,3 -1210,4 +1220,4 @@@ source "block/Kconfig
  config PREEMPT_NOTIFIERS
        bool
  
+ source "kernel/Kconfig.locks"