2 files changed, 48 insertions, 31 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 95ac2657b0f4..455170e1c1e3 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -214,27 +214,6 @@ config TASK_IO_ACCOUNTING
 
           Say N if unsure.
 
-config USER_NS
-        bool "User Namespaces (EXPERIMENTAL)"
-        default n
-        depends on EXPERIMENTAL
-        help
-          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 PID_NS
-        bool "PID Namespaces (EXPERIMENTAL)"
-        default n
-        depends on EXPERIMENTAL
-        help
-          Suport process id namespaces.  This allows having multiple
-          process 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
-          say N here.
-
 config AUDIT
         bool "Auditing support"
         depends on NET
@@ -420,6 +399,49 @@ config RELAY
 
           If unsure, say N.
 
+config NAMESPACES
+        bool "Namespaces support" if EMBEDDED
+        default !EMBEDDED
+        help
+          Provides the way to make tasks work with different objects using
+          the same id. For example same IPC id may refer to different objects
+          or same user id or pid may refer to different tasks when used in
+          different namespaces.
+
+config UTS_NS
+        bool "UTS namespace"
+        depends on NAMESPACES
+        help
+          In this namespace tasks see different info provided with the
+          uname() system call
+
+config IPC_NS
+        bool "IPC namespace"
+        depends on NAMESPACES && SYSVIPC
+        help
+          In this namespace tasks work with IPC ids which correspond to
+          different IPC objects in different namespaces
+
+config USER_NS
+        bool "User namespace (EXPERIMENTAL)"
+        depends on NAMESPACES && EXPERIMENTAL
+        help
+          This allows containers, i.e. vservers, to use user namespaces
+          to provide different user info for different servers.
+          If unsure, say N.
+
+config PID_NS
+        bool "PID Namespaces (EXPERIMENTAL)"
+        default n
+        depends on NAMESPACES && EXPERIMENTAL
+        help
+          Suport process id namespaces.  This allows having multiple
+          process 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
+          say N here.
+
 config BLK_DEV_INITRD
         bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
         depends on BROKEN || !FRV
diff --git a/init/main.c b/init/main.c
index 2a78932f6c07..c59859b85db0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -238,22 +238,18 @@ EXPORT_SYMBOL(loops_per_jiffy);
 
 static int __init debug_kernel(char *str)
 {
-        if (*str)
-                return 0;
         console_loglevel = 10;
-        return 1;
+        return 0;
 }
 
 static int __init quiet_kernel(char *str)
 {
-        if (*str)
-                return 0;
         console_loglevel = 4;
-        return 1;
+        return 0;
 }
 
-__setup("debug", debug_kernel);
-__setup("quiet", quiet_kernel);
+early_param("debug", debug_kernel);
+early_param("quiet", quiet_kernel);
 
 static int __init loglevel(char *str)
 {
@@ -261,7 +257,7 @@ static int __init loglevel(char *str)
         return 1;
 }
 
-__setup("loglevel=", loglevel);
+early_param("loglevel", loglevel);
 
 /*
  * Unknown boot options get handed to init, unless they look like
@@ -833,7 +829,6 @@ static int __init kernel_init(void * unused)
          */
         init_pid_ns.child_reaper = current;
 
-        __set_special_pids(1, 1);
         cad_pid = task_pid(current);
 
         smp_prepare_cpus(setup_max_cpus);