From e1f76c2e5622860ce8cabd08b7ceebad5d2baf8f Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 16 Dec 2009 18:04:31 +0100 Subject: [PATCH] --- yaml --- r: 178025 b: refs/heads/master c: 933b0618d8b2a59c7a0742e43836544e02f1e9bd h: refs/heads/master i: 178023: 48093d767efbf055148c28b9e09d99b83829c47e v: v3 --- [refs] | 2 +- trunk/init/main.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6ea0ffb7971a..cb4f30900abc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee1156c11a1121e118b0a7f2dec240f0d421b1fd +refs/heads/master: 933b0618d8b2a59c7a0742e43836544e02f1e9bd diff --git a/trunk/init/main.c b/trunk/init/main.c index c3db4a98b369..dac44a9356a5 100644 --- a/trunk/init/main.c +++ b/trunk/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); }