X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=init%2Fmain.c;fp=init%2Fmain.c;h=c2ea72362ee3ad38351b2b66d9d280db488652b3;hb=cff7d378d3fdbb53db9b6e2578b14855f401cd41;hp=58c9e374704bb20cfff41fa92afcf7cafe498c32;hpb=5ba9ac8e2c45ab165e5b4a246f4821d319656e9d;p=deliverable%2Flinux.git

diff --git a/init/main.c b/init/main.c
index 58c9e374704b..c2ea72362ee3 100644
--- a/init/main.c
+++ b/init/main.c
@@ -452,20 +452,6 @@ void __init parse_early_param(void)
 	done = 1;
 }
 
-/*
- *	Activate the first processor.
- */
-
-static void __init boot_cpu_init(void)
-{
-	int cpu = smp_processor_id();
-	/* Mark the boot cpu "present", "online" etc for SMP and UP case */
-	set_cpu_online(cpu, true);
-	set_cpu_active(cpu, true);
-	set_cpu_present(cpu, true);
-	set_cpu_possible(cpu, true);
-}
-
 void __init __weak smp_setup_processor_id(void)
 {
 }
@@ -530,6 +516,7 @@ asmlinkage __visible void __init start_kernel(void)
 	setup_command_line(command_line);
 	setup_nr_cpu_ids();
 	setup_per_cpu_areas();
+	boot_cpu_state_init();
 	smp_prepare_boot_cpu();	/* arch-specific boot-cpu hooks */
 
 	build_all_zonelists(NULL, NULL);