From patchwork Tue Nov 17 12:07:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mel Gorman X-Patchwork-Id: 38628 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 74C4B10140D for ; Tue, 17 Nov 2009 23:17:27 +1100 (EST) Received: by ozlabs.org (Postfix) id 1AD821007E0; Tue, 17 Nov 2009 23:16:54 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from gir.skynet.ie (gir.skynet.ie [193.1.99.77]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BE8F8B7B65 for ; Tue, 17 Nov 2009 23:16:53 +1100 (EST) Received: from localhost.localdomain (skynet.skynet.ie [193.1.99.74]) by gir.skynet.ie (Postfix) with ESMTP id AE35512356; Tue, 17 Nov 2009 12:06:17 +0000 (GMT) From: Mel Gorman To: Paul Mackerras , Benjamin Herrenschmidt Subject: [PATCH 3/4] powerpc: Only define smp_pSeries_cpu_bootable when CONFIG_XICS is set Date: Tue, 17 Nov 2009 12:07:38 +0000 Message-Id: <1258459659-11770-4-git-send-email-mel@csn.ul.ie> X-Mailer: git-send-email 1.6.5 In-Reply-To: <1258459659-11770-1-git-send-email-mel@csn.ul.ie> References: <1258459659-11770-1-git-send-email-mel@csn.ul.ie> Cc: Mel Gorman , linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org 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: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org If CONFIG_XICS is set, then smp_pSeries_cpu_bootable() is unnecessary. As warnings are treated as errors, this fails to build. This patch only defines smp_pSeries_cpu_bootable() when CONFIG_XICS is set. Signed-off-by: Mel Gorman --- arch/powerpc/platforms/pseries/smp.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c index da78ea5..62b1141 100644 --- a/arch/powerpc/platforms/pseries/smp.c +++ b/arch/powerpc/platforms/pseries/smp.c @@ -130,6 +130,15 @@ static void __devinit smp_pSeries_kick_cpu(int nr) paca[nr].cpu_start = 1; } +#ifdef CONFIG_MPIC +static struct smp_ops_t pSeries_mpic_smp_ops = { + .message_pass = smp_mpic_message_pass, + .probe = smp_mpic_probe, + .kick_cpu = smp_pSeries_kick_cpu, + .setup_cpu = smp_mpic_setup_cpu, +}; +#endif +#ifdef CONFIG_XICS static int smp_pSeries_cpu_bootable(unsigned int nr) { /* Special case - we inhibit secondary thread startup @@ -142,15 +151,7 @@ static int smp_pSeries_cpu_bootable(unsigned int nr) return 1; } -#ifdef CONFIG_MPIC -static struct smp_ops_t pSeries_mpic_smp_ops = { - .message_pass = smp_mpic_message_pass, - .probe = smp_mpic_probe, - .kick_cpu = smp_pSeries_kick_cpu, - .setup_cpu = smp_mpic_setup_cpu, -}; -#endif -#ifdef CONFIG_XICS + static struct smp_ops_t pSeries_xics_smp_ops = { .message_pass = smp_xics_message_pass, .probe = smp_xics_probe,