1 files changed, 15 insertions, 4 deletions

diff --git a/init/Kconfig b/init/Kconfig
index d367bf6bcc34..9ee778294756 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -297,7 +297,7 @@ config AUDIT
 
 config AUDITSYSCALL
         bool "Enable system-call auditing support"
-        depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64|| SUPERH)
+        depends on AUDIT && (X86 || PPC || S390 || IA64 || UML || SPARC64 || SUPERH)
         default y if SECURITY_SELINUX
         help
           Enable low-overhead system-call auditing infrastructure that
@@ -615,7 +615,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
@@ -946,7 +946,7 @@ config PERF_EVENTS
           Enable kernel support for various performance events provided
           by software and hardware.
 
-          Software events are supported either build-in or via the
+          Software events are supported either built-in or via the
           use of generic tracepoints.
 
           Most modern CPUs support performance events via performance
@@ -958,7 +958,7 @@ config PERF_EVENTS
           used to profile the code that runs on that CPU.
 
           The Linux Performance Event subsystem provides an abstraction of
-          these software and hardware cevent apabilities, available via a
+          these software and hardware event capabilities, available via a
           system call and used by the "perf" utility in tools/perf/. It
           provides per task and per CPU counters, and it provides event
           capabilities on top of those.
@@ -1107,6 +1107,16 @@ config SLOW_WORK
 
           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
@@ -1219,3 +1229,4 @@ source "block/Kconfig"
 config PREEMPT_NOTIFIERS
         bool
 
+source "kernel/Kconfig.locks"