init: set nr_cpu_ids before setup_per_cpu_areas()
authorTejun Heo <tj@kernel.org>
Tue, 21 Jul 2009 08:11:50 +0000 (17:11 +0900)
committerTejun Heo <tj@kernel.org>
Fri, 14 Aug 2009 03:56:54 +0000 (12:56 +0900)
nr_cpu_ids is dependent only on cpu_possible_map and
setup_per_cpu_areas() already depends on cpu_possible_map and will use
nr_cpu_ids.  Initialize nr_cpu_ids before setting up percpu areas.

Signed-off-by: Tejun Heo <tj@kernel.org>
init/main.c

index 2c5ade79eb81718702dd1fdf44e8b129e69f88a9..2d9d6bdfe7c929358dd41ba39f7934929ef5e684 100644 (file)
@@ -584,8 +584,8 @@ asmlinkage void __init start_kernel(void)
        setup_arch(&command_line);
        mm_init_owner(&init_mm, &init_task);
        setup_command_line(command_line);
-       setup_per_cpu_areas();
        setup_nr_cpu_ids();
+       setup_per_cpu_areas();
        smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
 
        build_all_zonelists();