Merge branch 'topic/jack-free-fix' into topic/hda

[sfrench/cifs-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 09c79537ae095b9d76d2970a79fa242e28955da2..7be4d3836745a049596e7be06b5e850c035b1f72 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -208,6 +208,12 @@ config POSIX_MQUEUE
 
          If unsure, say Y.
 
+config POSIX_MQUEUE_SYSCTL
+       bool
+       depends on POSIX_MQUEUE
+       depends on SYSCTL
+       default y
+
 config BSD_PROCESS_ACCT
        bool "BSD Process Accounting"
        help
@@ -670,10 +676,10 @@ config UTS_NS
 
 config IPC_NS
        bool "IPC namespace"
-       depends on NAMESPACES && SYSVIPC
+       depends on NAMESPACES && (SYSVIPC || POSIX_MQUEUE)
        help
          In this namespace tasks work with IPC ids which correspond to
-         different IPC objects in different namespaces
+         different IPC objects in different namespaces.
 
 config USER_NS
        bool "User namespace (EXPERIMENTAL)"
@@ -802,6 +808,14 @@ config KALLSYMS_EXTRA_PASS
           you wait for kallsyms to be fixed.
 
 
+config STRIP_ASM_SYMS
+       bool "Strip assembler-generated symbols during link"
+       default n
+       help
+         Strip internal assembler-generated symbols during a link (symbols
+         that look like '.Lxxx') so they don't pollute the output of
+         get_wchan() and suchlike.
+
 config HOTPLUG
        bool "Support for hot-pluggable devices" if EMBEDDED
        default y
@@ -1016,7 +1030,7 @@ source "arch/Kconfig"
 
 config SLOW_WORK
        default n
-       bool "Enable slow work thread pool"
+       bool
        help
          The slow work thread pool provides a number of dynamically allocated
          threads that can be used by the kernel to perform operations that
@@ -1026,6 +1040,8 @@ config SLOW_WORK
          by a series of mkdirs and a create call, all of which have to touch
          disk.
 
+         See Documentation/slow-work.txt.
+
 endmenu                # General setup
 
 config HAVE_GENERIC_DMA_COHERENT