From patchwork Mon May 12 15:31:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 348063 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 4BD6C140122 for ; Tue, 13 May 2014 01:32:27 +1000 (EST) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2lp0212.outbound.protection.outlook.com [207.46.163.212]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BC1B814007D for ; Tue, 13 May 2014 01:31:55 +1000 (EST) Received: from BY2PR03CA028.namprd03.prod.outlook.com (10.242.234.149) by BY2PR03MB393.namprd03.prod.outlook.com (10.141.141.12) with Microsoft SMTP Server (TLS) id 15.0.939.12; Mon, 12 May 2014 15:31:39 +0000 Received: from BL2FFO11FD005.protection.gbl (2a01:111:f400:7c09::194) by BY2PR03CA028.outlook.office365.com (2a01:111:e400:2c2c::21) with Microsoft SMTP Server (TLS) id 15.0.944.11 via Frontend Transport; Mon, 12 May 2014 15:31:31 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD005.mail.protection.outlook.com (10.173.161.1) with Microsoft SMTP Server (TLS) id 15.0.939.9 via Frontend Transport; Mon, 12 May 2014 15:31:30 +0000 Received: from aoeu.am.freescale.net (aoeu.am.freescale.net [10.81.32.119]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s4CFVSqH003617; Mon, 12 May 2014 08:31:29 -0700 From: Scott Wood To: Subject: [PATCH] powerpc: fix build of epapr_paravirt on 64-bit book3s Date: Mon, 12 May 2014 10:31:22 -0500 Message-ID: <1399908682-28825-1-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009001)(6009001)(199002)(189002)(68736004)(86362001)(77096999)(62966002)(92726001)(92566001)(47776003)(19580395003)(20776003)(80022001)(79102001)(97736001)(93916002)(81542001)(69596002)(50226001)(33646001)(77982001)(83072002)(31966008)(83322001)(74502001)(99396002)(85852003)(81342001)(19580405001)(76482001)(2009001)(44976005)(89996001)(88136002)(77156001)(87936001)(84676001)(64706001)(4396001)(74662001)(50466002)(46102001)(6806004)(87286001)(21056001)(36756003)(50986999)(48376002)(81156002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB393; H:az84smr01.freescale.net; FPR:; MLV:sfv; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Forefront-PRVS: 0209425D0A Received-SPF: Fail (: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=scottwood@freescale.com; X-OriginatorOrg: freescale.com Cc: Scott Wood , Stuart Yoder X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" This fixes an allyesconfig build break introduced by commit 7762b1ed7aaee223230793fcee80672e2e3aa7a8 "powerpc: move epapr paravirt init of power_save to an initcall". Signed-off-by: Scott Wood Cc: Stuart Yoder --- arch/powerpc/kernel/epapr_paravirt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c index 8a7a62c..eab2f2a 100644 --- a/arch/powerpc/kernel/epapr_paravirt.c +++ b/arch/powerpc/kernel/epapr_paravirt.c @@ -73,8 +73,10 @@ int __init epapr_paravirt_early_init(void) static int __init epapr_idle_init(void) { +#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64) if (epapr_has_idle) ppc_md.power_save = epapr_ev_idle; +#endif return 0; }