]> err.no Git - linux-2.6/commitdiff
x86: move assignment of CPU_PREPARE before do_boot_cpu
authorGlauber de Oliveira Costa <gcosta@redhat.com>
Wed, 19 Mar 2008 17:25:17 +0000 (14:25 -0300)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Apr 2008 15:41:00 +0000 (17:41 +0200)
Done to match x86_64

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/smpboot_32.c

index ee6f3bd703900433e1a7427fe432a370e53ad3b1..0e86ccc90d821ec23cc81edfe3711b77d408bafd 100644 (file)
@@ -958,6 +958,7 @@ int __cpuinit native_cpu_up(unsigned int cpu)
                return -EINVAL;
        }
 
+       per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
 #ifdef CONFIG_HOTPLUG_CPU
 
        /*
@@ -976,7 +977,6 @@ int __cpuinit native_cpu_up(unsigned int cpu)
                return -EIO;
        }
 
-       per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
        /* Unleash the CPU! */
        cpu_set(cpu, smp_commenced_mask);