1 files changed, 5 insertions, 10 deletions

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);