1 files changed, 80 insertions, 24 deletions

diff --git a/init/main.c b/init/main.c
index ff49a6dacfb..1ca6b32c482 100644
--- a/init/main.c
+++ b/init/main.c
@@ -87,7 +87,6 @@ extern void mca_init(void);
 extern void sbus_init(void);
 extern void prio_tree_init(void);
 extern void radix_tree_init(void);
-extern void free_initmem(void);
 #ifndef CONFIG_DEBUG_RODATA
 static inline void mark_rodata_ro(void) { }
 #endif
@@ -226,13 +225,9 @@ static int __init loglevel(char *str)
 
 early_param("loglevel", loglevel);
 
-/*
- * Unknown boot options get handed to init, unless they look like
- * unused parameters (modprobe will find them in /proc/cmdline).
- */
-static int __init unknown_bootoption(char *param, char *val)
+/* Change NUL term back to "=", to make "param" the whole string. */
+static int __init repair_env_string(char *param, char *val, const char *unused)
 {
-        /* Change NUL term back to "=", to make "param" the whole string. */
         if (val) {
                 /* param=val or param="val"? */
                 if (val == param+strlen(param)+1)
@@ -244,6 +239,16 @@ static int __init unknown_bootoption(char *param, char *val)
                 } else
                         BUG();
         }
+        return 0;
+}
+
+/*
+ * Unknown boot options get handed to init, unless they look like
+ * unused parameters (modprobe will find them in /proc/cmdline).
+ */
+static int __init unknown_bootoption(char *param, char *val, const char *unused)
+{
+        repair_env_string(param, val, unused);
 
         /* Handle obsolete-style parameters */
         if (obsolete_checksetup(param))
@@ -374,16 +379,13 @@ static noinline void __init_refok rest_init(void)
          * at least once to get things moving:
          */
         init_idle_bootup_task(current);
-        preempt_enable_no_resched();
-        schedule();
-
+        schedule_preempt_disabled();
         /* Call into cpu_idle with preempt disabled */
-        preempt_disable();
         cpu_idle();
 }
 
 /* Check for early params. */
-static int __init do_early_param(char *param, char *val)
+static int __init do_early_param(char *param, char *val, const char *unused)
 {
         const struct obs_kernel_param *p;
 
@@ -403,7 +405,7 @@ static int __init do_early_param(char *param, char *val)
 
 void __init parse_early_options(char *cmdline)
 {
-        parse_args("early options", cmdline, NULL, 0, do_early_param);
+        parse_args("early options", cmdline, NULL, 0, 0, 0, do_early_param);
 }
 
 /* Arch code calls this early on, or if not, just before other parsing. */
@@ -449,8 +451,8 @@ void __init __weak thread_info_cache_init(void)
 static void __init mm_init(void)
 {
         /*
-         * page_cgroup requires countinous pages as memmap
-         * and it's bigger than MAX_ORDER unless SPARSEMEM.
+         * page_cgroup requires contiguous pages,
+         * bigger than MAX_ORDER unless SPARSEMEM.
          */
         page_cgroup_init_flatmem();
         mem_init();
@@ -506,7 +508,7 @@ asmlinkage void __init start_kernel(void)
         parse_early_param();
         parse_args("Booting kernel", static_command_line, __start___param,
                    __stop___param - __start___param,
-                   &unknown_bootoption);
+                   0, 0, &unknown_bootoption);
 
         jump_label_init();
 
@@ -558,9 +560,6 @@ asmlinkage void __init start_kernel(void)
         early_boot_irqs_disabled = false;
         local_irq_enable();
 
-        /* Interrupts are enabled now so all GFP allocations are safe. */
-        gfp_allowed_mask = __GFP_BITS_MASK;
-
         kmem_cache_init_late();
 
         /*
@@ -702,16 +701,69 @@ int __init_or_module do_one_initcall(initcall_t fn)
 }
 
 
-extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
-
-static void __init do_initcalls(void)
+extern initcall_t __initcall_start[];
+extern initcall_t __initcall0_start[];
+extern initcall_t __initcall1_start[];
+extern initcall_t __initcall2_start[];
+extern initcall_t __initcall3_start[];
+extern initcall_t __initcall4_start[];
+extern initcall_t __initcall5_start[];
+extern initcall_t __initcall6_start[];
+extern initcall_t __initcall7_start[];
+extern initcall_t __initcall_end[];
+
+static initcall_t *initcall_levels[] __initdata = {
+        __initcall0_start,
+        __initcall1_start,
+        __initcall2_start,
+        __initcall3_start,
+        __initcall4_start,
+        __initcall5_start,
+        __initcall6_start,
+        __initcall7_start,
+        __initcall_end,
+};
+
+static char *initcall_level_names[] __initdata = {
+        "early",
+        "core",
+        "postcore",
+        "arch",
+        "subsys",
+        "fs",
+        "device",
+        "late",
+};
+
+static void __init do_initcall_level(int level)
 {
+        extern const struct kernel_param __start___param[], __stop___param[];
         initcall_t *fn;
 
-        for (fn = __early_initcall_end; fn < __initcall_end; fn++)
+        strcpy(static_command_line, saved_command_line);
+        parse_args(initcall_level_names[level],
+                   static_command_line, __start___param,
+                   __stop___param - __start___param,
+                   level, level,
+                   &repair_env_string);
+
+        for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++)
                 do_one_initcall(*fn);
 }
 
+static void __init do_initcalls(void)
+{
+        int level;
+
+        for (level = 0; level < ARRAY_SIZE(initcall_levels) - 1; level++) {
+                pr_info("initlevel:%d=%s, %d registered initcalls\n",
+                        level, initcall_level_names[level],
+                        (int) (initcall_levels[level+1]
+                                - initcall_levels[level]));
+                do_initcall_level(level);
+        }
+}
+
 /*
  * Ok, the machine is now initialized. None of the devices
  * have been touched yet, but the CPU subsystem is up and
@@ -735,7 +787,7 @@ static void __init do_pre_smp_initcalls(void)
 {
         initcall_t *fn;
 
-        for (fn = __initcall_start; fn < __early_initcall_end; fn++)
+        for (fn = __initcall_start; fn < __initcall0_start; fn++)
                 do_one_initcall(*fn);
 }
 
@@ -792,6 +844,10 @@ static int __init kernel_init(void * unused)
          * Wait until kthreadd is all set-up.
          */
         wait_for_completion(&kthreadd_done);
+
+        /* Now the scheduler is fully set up and can do blocking allocations */
+        gfp_allowed_mask = __GFP_BITS_MASK;
+
         /*
          * init can allocate pages on any node
          */