1 files changed, 39 insertions, 26 deletions

diff --git a/init/main.c b/init/main.c
index 4051d75dd2d6..5c8540271529 100644
--- a/init/main.c
+++ b/init/main.c
@@ -25,7 +25,6 @@
 #include <linux/bootmem.h>
 #include <linux/acpi.h>
 #include <linux/tty.h>
-#include <linux/gfp.h>
 #include <linux/percpu.h>
 #include <linux/kmod.h>
 #include <linux/vmalloc.h>
@@ -69,6 +68,7 @@
 #include <linux/kmemtrace.h>
 #include <linux/sfi.h>
 #include <linux/shmem_fs.h>
+#include <linux/slab.h>
 #include <trace/boot.h>
 
 #include <asm/io.h>
@@ -149,6 +149,20 @@ static int __init nosmp(char *str)
 
 early_param("nosmp", nosmp);
 
+/* this is hard limit */
+static int __init nrcpus(char *str)
+{
+        int nr_cpus;
+
+        get_option(&str, &nr_cpus);
+        if (nr_cpus > 0 && nr_cpus < nr_cpu_ids)
+                nr_cpu_ids = nr_cpus;
+
+        return 0;
+}
+
+early_param("nr_cpus", nrcpus);
+
 static int __init maxcpus(char *str)
 {
         get_option(&str, &setup_max_cpus);
@@ -160,7 +174,7 @@ static int __init maxcpus(char *str)
 
 early_param("maxcpus", maxcpus);
 #else
-const unsigned int setup_max_cpus = NR_CPUS;
+static const unsigned int setup_max_cpus = NR_CPUS;
 #endif
 
 /*
@@ -369,12 +383,6 @@ static void __init smp_init(void)
 {
         unsigned int cpu;
 
-        /*
-         * Set up the current CPU as possible to migrate to.
-         * The other ones will be done by cpu_up/cpu_down()
-         */
-        set_cpu_active(smp_processor_id(), true);
-
         /* FIXME: This should be done in userspace --RR */
         for_each_present_cpu(cpu) {
                 if (num_online_cpus() >= setup_max_cpus)
@@ -422,7 +430,9 @@ static noinline void __init_refok rest_init(void)
         kernel_thread(kernel_init, NULL, CLONE_FS | CLONE_SIGHAND);
         numa_default_policy();
         pid = kernel_thread(kthreadd, NULL, CLONE_FS | CLONE_FILES);
+        rcu_read_lock();
         kthreadd_task = find_task_by_pid_ns(pid, &init_pid_ns);
+        rcu_read_unlock();
         unlock_kernel();
 
         /*
@@ -486,6 +496,7 @@ static void __init boot_cpu_init(void)
         int cpu = smp_processor_id();
         /* Mark the boot cpu "present", "online" etc for SMP and UP case */
         set_cpu_online(cpu, true);
+        set_cpu_active(cpu, true);
         set_cpu_present(cpu, true);
         set_cpu_possible(cpu, true);
 }
@@ -589,6 +600,7 @@ asmlinkage void __init start_kernel(void)
                 local_irq_disable();
         }
         rcu_init();
+        radix_tree_init();
         /* init some links before init_ISA_irqs() */
         early_irq_init();
         init_IRQ();
@@ -606,7 +618,7 @@ asmlinkage void __init start_kernel(void)
         local_irq_enable();
 
         /* Interrupts are enabled now so all GFP allocations are safe. */
-        set_gfp_allowed_mask(__GFP_BITS_MASK);
+        gfp_allowed_mask = __GFP_BITS_MASK;
 
         kmem_cache_init_late();
 
@@ -664,7 +676,6 @@ asmlinkage void __init start_kernel(void)
         key_init();
         security_init();
         vfs_caches_init(totalram_pages);
-        radix_tree_init();
         signals_init();
         /* rootfs populating might need page-writeback */
         page_writeback_init();
@@ -691,10 +702,10 @@ asmlinkage void __init start_kernel(void)
 static void __init do_ctors(void)
 {
 #ifdef CONFIG_CONSTRUCTORS
-        ctor_fn_t *call = (ctor_fn_t *) __ctors_start;
+        ctor_fn_t *fn = (ctor_fn_t *) __ctors_start;
 
-        for (; call < (ctor_fn_t *) __ctors_end; call++)
-                (*call)();
+        for (; fn < (ctor_fn_t *) __ctors_end; fn++)
+                (*fn)();
 #endif
 }
 
@@ -755,10 +766,10 @@ extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
 
 static void __init do_initcalls(void)
 {
-        initcall_t *call;
+        initcall_t *fn;
 
-        for (call = __early_initcall_end; call < __initcall_end; call++)
-                do_one_initcall(*call);
+        for (fn = __early_initcall_end; fn < __initcall_end; fn++)
+                do_one_initcall(*fn);
 
         /* Make sure there is no pending stuff from the initcall sequence */
         flush_scheduled_work();
@@ -785,10 +796,10 @@ static void __init do_basic_setup(void)
 
 static void __init do_pre_smp_initcalls(void)
 {
-        initcall_t *call;
+        initcall_t *fn;
 
-        for (call = __initcall_start; call < __early_initcall_end; call++)
-                do_one_initcall(*call);
+        for (fn = __initcall_start; fn < __early_initcall_end; fn++)
+                do_one_initcall(*fn);
 }
 
 static void run_init_process(char *init_filename)
@@ -811,11 +822,6 @@ static noinline int init_post(void)
         system_state = SYSTEM_RUNNING;
         numa_default_policy();
 
-        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
-                printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-
-        (void) sys_dup(0);
-        (void) sys_dup(0);
 
         current->signal->flags |= SIGNAL_UNKILLABLE;
 
@@ -841,7 +847,8 @@ static noinline int init_post(void)
         run_init_process("/bin/init");
         run_init_process("/bin/sh");
 
-        panic("No init found.  Try passing init= option to kernel.");
+        panic("No init found.  Try passing init= option to kernel. "
+              "See Linux Documentation/init.txt for guidance.");
 }
 
 static int __init kernel_init(void * unused)
@@ -851,7 +858,7 @@ static int __init kernel_init(void * unused)
         /*
          * init can allocate pages on any node
          */
-        set_mems_allowed(node_possible_map);
+        set_mems_allowed(node_states[N_HIGH_MEMORY]);
         /*
          * init can run on any cpu.
          */
@@ -878,6 +885,12 @@ static int __init kernel_init(void * unused)
 
         do_basic_setup();
 
+        /* Open the /dev/console on the rootfs, this should never fail */
+        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+                printk(KERN_WARNING "Warning: unable to open an initial console.\n");
+
+        (void) sys_dup(0);
+        (void) sys_dup(0);
         /*
          * check if there is an early userspace init.  If yes, let it do all
          * the work