Pull tables-in-sysfs into release branch

[~andy/linux] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 9264895ab331a2e9fe2f229e493b0c8f52e0438f..e2056828dc64159474cf44b3037e5b2bda54663f 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -120,15 +120,6 @@ config SYSVIPC
          section 6.4 of the Linux Programmer's Guide, available from
          <http://www.tldp.org/guides.html>.
 
          section 6.4 of the Linux Programmer's Guide, available from
          <http://www.tldp.org/guides.html>.
 

-config IPC_NS
-       bool "IPC Namespaces"
-       depends on SYSVIPC
-       default n
-       help
-         Support ipc namespaces.  This allows containers, i.e. virtual
-         environments, to use ipc namespaces to provide different ipc
-         objects for different servers.  If unsure, say N.
-

 config SYSVIPC_SYSCTL
        bool
        depends on SYSVIPC
 config SYSVIPC_SYSCTL
        bool
        depends on SYSVIPC


@@ -218,13 +209,14 @@ config TASK_IO_ACCOUNTING
 
          Say N if unsure.
 
 
          Say N if unsure.
 

-config UTS_NS
-       bool "UTS Namespaces"
+config USER_NS
+       bool "User Namespaces (EXPERIMENTAL)"

        default n
        default n

+       depends on EXPERIMENTAL

        help
        help

-         Support uts namespaces.  This allows containers, i.e.
-         vservers, to use uts namespaces to provide different
-         uts info for different servers.  If unsure, say N.
+         Support user namespaces.  This allows containers, i.e.
+         vservers, to use user namespaces to provide different
+         user info for different servers.  If unsure, say N.

 
 config AUDIT
        bool "Auditing support"
 
 config AUDIT
        bool "Auditing support"


@@ -554,7 +546,7 @@ config SLUB_DEBUG
 
 choice
        prompt "Choose SLAB allocator"
 
 choice
        prompt "Choose SLAB allocator"

-       default SLAB
+       default SLUB

        help
           This option allows to select a slab allocator.
 
        help
           This option allows to select a slab allocator.
 


@@ -567,7 +559,6 @@ config SLAB
          a slab allocator.
 
 config SLUB
          a slab allocator.
 
 config SLUB

-       depends on EXPERIMENTAL && !ARCH_USES_SLAB_PAGE_STRUCT

        bool "SLUB (Unqueued Allocator)"
        help
           SLUB is a slab allocator that minimizes cache line usage
        bool "SLUB (Unqueued Allocator)"
        help
           SLUB is a slab allocator that minimizes cache line usage


@@ -577,7 +568,7 @@ config SLUB
           and has enhanced diagnostics.
 
 config SLOB
           and has enhanced diagnostics.
 
 config SLOB

-       depends on EMBEDDED && !SPARSEMEM
+       depends on EMBEDDED

        bool "SLOB (Simple Allocator)"
        help
           SLOB replaces the SLAB allocator with a drastically simpler
        bool "SLOB (Simple Allocator)"
        help
           SLOB replaces the SLAB allocator with a drastically simpler


@@ -603,9 +594,7 @@ config BASE_SMALL
        default 0 if BASE_FULL
        default 1 if !BASE_FULL
 
        default 0 if BASE_FULL
        default 1 if !BASE_FULL
 

-menu "Loadable module support"
-
-config MODULES
+menuconfig MODULES

        bool "Enable loadable module support"
        help
          Kernel modules are small pieces of compiled code which can
        bool "Enable loadable module support"
        help
          Kernel modules are small pieces of compiled code which can


@@ -685,8 +674,5 @@ config STOP_MACHINE
        depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
        help
          Need stop_machine() primitive.
        depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
        help
          Need stop_machine() primitive.

-endmenu

 
 

-menu "Block layer"

 source "block/Kconfig"
 source "block/Kconfig"

-endmenu