commit d6647bdf98a0de19963de8d5d9698d469ed72097
author Tejun Heo <tj@kernel.org> Tue Jul 21 17:11:50 2009 +0900
committer Tejun Heo <tj@kernel.org> Fri Aug 14 12:56:54 2009 +0900
tree 9222f824e53d69212a4ea9ff13e248bdfcc36704
parent 64f1607ffbbc772685733ea63e6f7f4183df1b16

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>

init/main.c

diff --git a/init/main.c b/init/main.c
index 2c5ade79..2d9d6bd 100644
--- a/init/main.c
+++ b/init/main.c
@@ -584,8 +584,8 @@
 	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();