Merge branch 'sh/g3-prep' into sh/for-2.6.33

1 files changed, 1 insertions, 6 deletions

diff --git a/init/main.c b/init/main.c
index c3db4a98b369..dac44a9356a5 100644
--- a/init/main.c
+++ b/init/main.c
@@ -369,12 +369,6 @@ static void __init smp_init(void)
 {
         unsigned int cpu;
 
-        /*
-         * Set up the current CPU as possible to migrate to.
-         * The other ones will be done by cpu_up/cpu_down()
-         */
-        set_cpu_active(smp_processor_id(), true);
-
         /* FIXME: This should be done in userspace --RR */
         for_each_present_cpu(cpu) {
                 if (num_online_cpus() >= setup_max_cpus)
@@ -486,6 +480,7 @@ 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);
 }