Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 1398a14b01919d500c59367ff5cffd61d9f39cad..f2f9b5362b48eebe3c50ff0d2f91a9130da429c4 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -208,6 +208,12 @@ config POSIX_MQUEUE
 
          If unsure, say Y.
 
 
          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
 config BSD_PROCESS_ACCT
        bool "BSD Process Accounting"
        help


@@ -565,7 +571,7 @@ config CGROUP_MEM_RES_CTLR
        select MM_OWNER
        help
          Provides a memory resource controller that manages both anonymous
        select MM_OWNER
        help
          Provides a memory resource controller that manages both anonymous

-         memory and page cache. (See Documentation/controllers/memory.txt)
+         memory and page cache. (See Documentation/cgroups/memory.txt)

 
          Note that setting this option increases fixed memory overhead
          associated with each page of memory in the system. By this,
 
          Note that setting this option increases fixed memory overhead
          associated with each page of memory in the system. By this,


@@ -670,10 +676,10 @@ config UTS_NS
 
 config IPC_NS
        bool "IPC namespace"
 
 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
        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)"
 
 config USER_NS
        bool "User namespace (EXPERIMENTAL)"


@@ -689,7 +695,7 @@ config PID_NS
        depends on NAMESPACES && EXPERIMENTAL
        help
          Support process id namespaces.  This allows having multiple
        depends on NAMESPACES && EXPERIMENTAL
        help
          Support process id namespaces.  This allows having multiple

-         process with the same pid as long as they are in different
+         processes with the same pid as long as they are in different

          pid namespaces.  This is a building block of containers.
 
          Unless you want to work with an experimental feature
          pid namespaces.  This is a building block of containers.
 
          Unless you want to work with an experimental feature


@@ -954,7 +960,7 @@ config COMPAT_BRK
          Randomizing heap placement makes heap exploits harder, but it
          also breaks ancient binaries (including anything libc5 based).
          This option changes the bootup default to heap randomization
          Randomizing heap placement makes heap exploits harder, but it
          also breaks ancient binaries (including anything libc5 based).
          This option changes the bootup default to heap randomization

-         disabled, and can be overriden runtime by setting
+         disabled, and can be overridden at runtime by setting

          /proc/sys/kernel/randomize_va_space to 2.
 
          On non-ancient distros (post-2000 ones) N is usually a safe choice.
          /proc/sys/kernel/randomize_va_space to 2.
 
          On non-ancient distros (post-2000 ones) N is usually a safe choice.


@@ -1007,13 +1013,27 @@ config TRACEPOINTS
 
 config MARKERS
        bool "Activate markers"
 
 config MARKERS
        bool "Activate markers"

-       depends on TRACEPOINTS
+       select TRACEPOINTS

        help
          Place an empty function call at each marker site. Can be
          dynamically changed for a probe function.
 
 source "arch/Kconfig"
 
        help
          Place an empty function call at each marker site. Can be
          dynamically changed for a probe function.
 
 source "arch/Kconfig"
 

+config SLOW_WORK
+       default n
+       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
+         take a relatively long time.
+
+         An example of this would be CacheFiles doing a path lookup followed
+         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
 endmenu                # General setup
 
 config HAVE_GENERIC_DMA_COHERENT


@@ -1112,7 +1132,7 @@ config INIT_ALL_POSSIBLE
          cpu_possible_map, some of them chose to initialize cpu_possible_map
          with all 1s, and others with all 0s.  When they were centralised,
          it was better to provide this option than to break all the archs
          cpu_possible_map, some of them chose to initialize cpu_possible_map
          with all 1s, and others with all 0s.  When they were centralised,
          it was better to provide this option than to break all the archs

-         and have several arch maintainers persuing me down dark alleys.
+         and have several arch maintainers pursuing me down dark alleys.

 
 config STOP_MACHINE
        bool
 
 config STOP_MACHINE
        bool