aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-12-16 18:04:31 +0100
committerIngo Molnar <mingo@elte.hu>2009-12-16 19:01:53 +0100
commit933b0618d8b2a59c7a0742e43836544e02f1e9bd (patch)
tree2d315a2d365fc27a9b43976940a963295e434ac4 /init/main.c
parentee1156c11a1121e118b0a7f2dec240f0d421b1fd (diff)
downloadmrst-s0i3-test-933b0618d8b2a59c7a0742e43836544e02f1e9bd.tar.gz
mrst-s0i3-test-933b0618d8b2a59c7a0742e43836544e02f1e9bd.tar.xz
mrst-s0i3-test-933b0618d8b2a59c7a0742e43836544e02f1e9bd.zip
sched: Mark boot-cpu active before smp_init()
A UP machine has 1 active cpu, not having the boot-cpu in the active map when starting the scheduler confuses things. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Mike Galbraith <efault@gmx.de> LKML-Reference: <20091216170517.423469527@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/init/main.c b/init/main.c
index c3db4a98b36..dac44a9356a 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);
}