aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-03-19 13:25:17 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:00 -0400
commit8154fa3740d2bbc64aa46e75bcccb71dd82280d3 (patch)
treecba2aaeed88f0584571d15c30628ac028c01d19b
parentf3ce4466abd6f5173db98b5cc2269c139cd1790a (diff)
x86: move assignment of CPU_PREPARE before do_boot_cpu
Done to match x86_64 Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/smpboot_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index ee6f3bd70390..0e86ccc90d82 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -958,6 +958,7 @@ int __cpuinit native_cpu_up(unsigned int cpu)
958 return -EINVAL; 958 return -EINVAL;
959 } 959 }
960 960
961 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
961#ifdef CONFIG_HOTPLUG_CPU 962#ifdef CONFIG_HOTPLUG_CPU
962 963
963 /* 964 /*
@@ -976,7 +977,6 @@ int __cpuinit native_cpu_up(unsigned int cpu)
976 return -EIO; 977 return -EIO;
977 } 978 }
978 979
979 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
980 /* Unleash the CPU! */ 980 /* Unleash the CPU! */
981 cpu_set(cpu, smp_commenced_mask); 981 cpu_set(cpu, smp_commenced_mask);
982 982