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

[linux-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index ab5c64801fe50ab21dc3ae7db263f5f19a99ad56..2e9a1457132cdbcd7cc3911a4d0db4e07a897e21 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -606,7 +606,7 @@ config SYSFS_DEPRECATED
        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,12 +1098,12 @@ config SLOW_WORK
 
          See Documentation/slow-work.txt.
 
-config SLOW_WORK_PROC
-       bool "Slow work debugging through /proc"
+config SLOW_WORK_DEBUG
+       bool "Slow work debugging through debugfs"
        default n
-       depends on SLOW_WORK && PROC_FS
+       depends on SLOW_WORK && DEBUG_FS
        help
-         Display the contents of the slow work run queue through /proc,
+         Display the contents of the slow work run queue through debugfs,
          including items currently executing.
 
          See Documentation/slow-work.txt.
@@ -1220,3 +1220,4 @@ source "block/Kconfig"
 config PREEMPT_NOTIFIERS
        bool
 
+source "kernel/Kconfig.locks"