From patchwork Thu May 2 21:02:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 241099 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B5F1A2C00A8 for ; Fri, 3 May 2013 07:04:58 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY0fH-00066j-Dx; Thu, 02 May 2013 21:03:43 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY0f5-00022b-1b; Thu, 02 May 2013 21:03:31 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY0ee-0001y2-Gj for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2013 21:03:08 +0000 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0LjtbV-1U19vy1B1d-00bdRX; Thu, 02 May 2013 23:02:39 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/9] ARM: imx: build CPU suspend code only when needed Date: Thu, 2 May 2013 23:02:52 +0200 Message-Id: <1367528578-518090-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1367528578-518090-1-git-send-email-arnd@arndb.de> References: <1367528578-518090-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:nCzrnBEElrGiKz8EGfe55hREaE1dcE9KXDORVfQQRxD QZLC+ejtuIccQg1U5BUWCq1n5naTwbfQ/hVqqFB837rz1iDb9J Ga2REbkyZqJfmDU/uZgSE9/k6/P294f5LCU7taXse+UO6a/7bO nlPLVNK9Bj/SgqzkIrJLrNg17Y9DukXSWs23k6JoQCBxe/p/zz t5V5kfm4ysfjtkCnknjH02QTjsMjDNN975lz6cW4KJDkQuy/yl a7pGHwSWzx8JhwfyCZ+OF62J7EM1QvuW4G4fInCz/rGXvfgipg Tx6dPaD0qaD3BkvUAXpCd6GVRz/NylkNfM49TpjSak4o7SmoQb 5aJk6+kFVADyQrMR9mpXqSVHm/r8e0I5afTBzYISo X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130502_170304_833320_65CD793D X-CRM114-Status: UNSURE ( 9.48 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.186 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: arm@kernel.org, Sascha Hauer , Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The ARM CPU suspend function has its own configuration symbol, which we need to use for conditionalizing any code calling into it as well. arch/arm/mach-imx/built-in.o: In function `v7_cpu_resume': /git/arm-soc/arch/arm/mach-imx/headsmp.S:57: undefined reference to `cpu_resume' Cc: Sascha Hauer Signed-off-by: Arnd Bergmann --- arch/arm/mach-imx/headsmp.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/headsmp.S b/arch/arm/mach-imx/headsmp.S index a58c8b0..67b9c48 100644 --- a/arch/arm/mach-imx/headsmp.S +++ b/arch/arm/mach-imx/headsmp.S @@ -24,7 +24,7 @@ ENTRY(v7_secondary_startup) ENDPROC(v7_secondary_startup) #endif -#ifdef CONFIG_PM +#ifdef CONFIG_ARM_CPU_SUSPEND /* * The following code must assume it is running from physical address * where absolute virtual addresses to the data section have to be