Use extended crashkernel command line on x86_64

[linux-2.6] / init / main.c

diff --git a/init/main.c b/init/main.c
index 450e6ee52ab6fd39fa92e7cef34f3d42a5443170..0dd0e7a1f6329fab9bfecb88f1363530459281e8 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -39,6 +39,7 @@
 #include <linux/writeback.h>
 #include <linux/cpu.h>
 #include <linux/cpuset.h>
+#include <linux/cgroup.h>
 #include <linux/efi.h>
 #include <linux/tick.h>
 #include <linux/interrupt.h>
@@ -397,10 +398,6 @@ static void __init smp_init(void)
 {
        unsigned int cpu;
 
-#ifndef CONFIG_HOTPLUG_CPU
-       cpu_possible_map = cpu_present_map;
-#endif
-
        /* FIXME: This should be done in userspace --RR */
        for_each_present_cpu(cpu) {
                if (num_online_cpus() >= max_cpus)
@@ -527,6 +524,7 @@ asmlinkage void __init start_kernel(void)
         */
        unwind_init();
        lockdep_init();
+       cgroup_init_early();
 
        local_irq_disable();
        early_boot_irqs_off();
@@ -545,10 +543,6 @@ asmlinkage void __init start_kernel(void)
        setup_arch(&command_line);
        setup_command_line(command_line);
        unwind_setup();
-#ifndef CONFIG_HOTPLUG_CPU
-       if (max_cpus < 2)
-               cpu_possible_map = cpu_online_map;
-#endif
        setup_per_cpu_areas();
        smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
 
@@ -648,6 +642,7 @@ asmlinkage void __init start_kernel(void)
 #ifdef CONFIG_PROC_FS
        proc_root_init();
 #endif
+       cgroup_init();
        cpuset_init();
        taskstats_init_early();
        delayacct_init();