diff options
author | Tejun Heo <tj@kernel.org> | 2009-07-21 04:11:50 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-08-13 23:56:54 -0400 |
commit | d6647bdf98a0de19963de8d5d9698d469ed72097 (patch) | |
tree | 9222f824e53d69212a4ea9ff13e248bdfcc36704 | |
parent | 64f1607ffbbc772685733ea63e6f7f4183df1b16 (diff) |
init: set nr_cpu_ids before setup_per_cpu_areas()
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>
-rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 2c5ade79eb81..2d9d6bdfe7c9 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -584,8 +584,8 @@ asmlinkage void __init start_kernel(void) | |||
584 | setup_arch(&command_line); | 584 | setup_arch(&command_line); |
585 | mm_init_owner(&init_mm, &init_task); | 585 | mm_init_owner(&init_mm, &init_task); |
586 | setup_command_line(command_line); | 586 | setup_command_line(command_line); |
587 | setup_per_cpu_areas(); | ||
588 | setup_nr_cpu_ids(); | 587 | setup_nr_cpu_ids(); |
588 | setup_per_cpu_areas(); | ||
589 | smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ | 589 | smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ |
590 | 590 | ||
591 | build_all_zonelists(); | 591 | build_all_zonelists(); |