From patchwork Tue Dec 15 15:03:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 41190 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id C56A9100860 for ; Wed, 16 Dec 2009 02:03:45 +1100 (EST) Received: by ozlabs.org (Postfix) id 46CC0B6F1A; Wed, 16 Dec 2009 02:03:35 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EB5A8B6EE9 for ; Wed, 16 Dec 2009 02:03:34 +1100 (EST) Received: from e53227.upc-e.chello.nl ([213.93.53.227] helo=twins) by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux)) id 1NKYvk-0003Ad-DP; Tue, 15 Dec 2009 15:03:16 +0000 Received: by twins (Postfix, from userid 1000) id 560B418014499; Tue, 15 Dec 2009 16:03:22 +0100 (CET) Subject: Re: [Next] CPU Hotplug test failures on powerpc From: Peter Zijlstra To: Sachin Sant In-Reply-To: <4B279370.5050800@in.ibm.com> References: <4B2224C7.1020908@in.ibm.com> <1260786122.4165.142.camel@twins> <4B261D7A.9040802@in.ibm.com> <1260793182.4165.223.camel@twins> <1260825420.2217.40.camel@pasglop> <4B275A6B.9030200@in.ibm.com> <1260873827.4165.362.camel@twins> <4B279370.5050800@in.ibm.com> Date: Tue, 15 Dec 2009 16:03:22 +0100 Message-ID: <1260889402.4165.434.camel@twins> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Cc: Ingo Molnar , linux-next@vger.kernel.org, linux-kernel , Linux/PPC Development X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Could you try the below? --- init/main.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/init/main.c b/init/main.c index 4051d75..4be7de2 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); }