summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-07-21 17:11:50 +0900
committerTejun Heo <tj@kernel.org>2009-08-14 12:56:54 +0900
commitd6647bdf98a0de19963de8d5d9698d469ed72097 (patch)
tree9222f824e53d69212a4ea9ff13e248bdfcc36704 /init/main.c
parent64f1607ffbbc772685733ea63e6f7f4183df1b16 (diff)
downloadlinux-stable-d6647bdf98a0de19963de8d5d9698d469ed72097.tar.gz
linux-stable-d6647bdf98a0de19963de8d5d9698d469ed72097.tar.bz2
linux-stable-d6647bdf98a0de19963de8d5d9698d469ed72097.zip
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>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c2
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)
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();