From patchwork Wed Dec 6 14:15:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 120848 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp7110003qgn; Wed, 6 Dec 2017 06:15:56 -0800 (PST) X-Google-Smtp-Source: AGs4zMZqhCDEEBQZldZQems7Nxjj6qwoT7VYV3YHze7vUa5bYjCw3pEogtioYwsDikfUIKwtP4wm X-Received: by 10.84.140.1 with SMTP id 1mr22083075pls.114.1512569756084; Wed, 06 Dec 2017 06:15:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512569756; cv=none; d=google.com; s=arc-20160816; b=fM/jmzz2SqZbQGH5Dzz3KQXU2HX02nOdi6oPqTtH22xS/RCyXuSfUVwZ4SXmvjbX+i GbF2JBCRyg4jAjnUId6NGRF8gFqwHotpZt+81W7pGcRJzj80LjuOgEwrtDiX1SFdjJb2 CzDeev+G5LsFb+C+tWZZ6D82achC2JDu48uO1KIZvTruTKWyQCboNLuDksbgec00sdUf Lvi0+wdnYbfPGjzZxFnyacDfQm19ofv8ZhEW/4IPQRq9CLS0kp3R2Z3xLvwWFZ6m7T3q 1EvhLkGM2neDHvLPgDfT7GIyPw+qoYCTJwiXfP21sC64eiENpbEHyfAeGrg3dIHFqjX1 HBfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=zVE8142452yk8Ivqsqij1kBPKCxjoLNy4rUAxmvIg1w=; b=lCvAGwntWZ2T6lLMVsxAjjxZ3qKDnnOHnS0zNaHEAWGBSYzKggD3tbcFiyF/mkCTgc K0n0wQ9f803NLs4CNwgeYZn8CWYRK4TA2F92n1E+AjYLgnEd/tpP2mQZ/h7aHlsChgPU dKXum4xHP5QqkMT7VOQfdoFWbrv39MDGDdyXLwujGAfQNK7c5i25cn3VURBa9B1cOQEc mHWhVgDPD2qZ/UI/0bOvYHTKNDcc7B2BfyWsuIvQ/0VGvVH4vzNXZljPDrrcCW9ZjzKf fzu0cWiaakIz7vRgrdfFHy6ntnD8I2ldWas1eVUGS8RjvNbw91y49KAO6NQ1K4oYBhI5 RHpA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u62si1930763pgc.253.2017.12.06.06.15.55; Wed, 06 Dec 2017 06:15:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752373AbdLFOPx (ORCPT + 4 others); Wed, 6 Dec 2017 09:15:53 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:50718 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752275AbdLFOPu (ORCPT ); Wed, 6 Dec 2017 09:15:50 -0500 Received: from wuerfel.lan ([149.172.96.106]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0LhifF-1eqv8p3kP3-00mv6x; Wed, 06 Dec 2017 15:15:19 +0100 From: Arnd Bergmann To: Tony Lindgren Cc: Arnd Bergmann , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds Date: Wed, 6 Dec 2017 15:15:07 +0100 Message-Id: <20171206141517.670032-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:SwvfDK22aZ7V8IrJRI0p6tESz1oKuV+EgOiTMdQS8I/uwhfR6SG UcHfKLvh0A3QawTvoG30fJxYByWAJApBUrsGk0TZFRA6XDNNa9GltNov05Z3DRHEvkeALuy 2OP4vOOstE2vCYQLG821C3xjGBPEgurz01R/9Iqtw9pKwqfE1WyJJwy3ed2q8ZPU6R8AVZX Wsg0aznTzZLkrIW4b4J4Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:v9alYcS3OZY=:Tntg3XzYKl5dMEFoJr4JRI o42qDNflOWwhRqDU+cFSEbEK618Ry2USytx/Wqm93Soe/WbZuLrTmuRjQuogq2ocW4QLFqopg gepvdYWcmCXInkU5/SYaHrzR32Yx/VwqQr9+SQRzComRbQGweHf8vvokps9Q7ZEIV6Jo1I0oC jFKZ0LShJje5C/FjyqL7yM+CO0qKdv+rIUpoPYjO915H0RWrsU+pgBDACHy3rQj/qPwfeNHWp gwviMkFj3Mal0/LlqdEh6Ci0+SurarVzZ+aItPMXW/9JdC49qT3WDqcv5sw893z6bLUSqJh4C ngobaHrAsB49XCZcx8LBYafjsIoyXBYvZbUn2ltxLK2C3ltLwMoTzlP4Lkt8afIKvm8b1u2pX AqYK9XrFI/7lwgDUOH7agFFFjpBgbrz3b5sVHyeywdqzEOBhoJINlnTpuWiaZWbargZOcvm5u nkHD0OLAWbbjNKtio9jJQItBZ/LIrOiYnrz/HOmz6PiaoPjpAkGOuSktjgYkpM9NLG2ZHjfLM smk+Uo39+9IzYUf2nrtpWkuYlb4/lR34IRJwSxI9OtIuyFpHkSYtll4fGtQhfrt6JpofgpBiX cvwwfeVspKTWgVF5aWFE4kAa2PkqVeF8QC+GoEl+FvayLV60xHz+QAp9PDfJE8W1/mia2tCo1 X43qSNzzNudZlTPw7LWvW6a5HREDpMHLvS4qJQaGNx9BiH9Jvzwh1+cTmEaCsB+TXF6FSoHDr KS9F6oBjG//1WtW3lYAF3bgbqrNRuRLpJ255NQ== Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org In configurations without CONFIG_OMAP3 but with secure RAM support, we now run into a link failure: arch/arm/mach-omap2/omap-secure.o: In function `omap3_save_secure_ram': omap-secure.c:(.text+0x130): undefined reference to `save_secure_ram_context' The omap3_save_secure_ram() function is only called from the OMAP34xx power management code, so we can simply hide that function in the appropriate #ifdef. Fixes: d09220a887f7 ("ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context") Signed-off-by: Arnd Bergmann --- arch/arm/mach-omap2/omap-secure.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Tony Lindgren Tested-by: Dan Murphy diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c index f9303dc631e4..7be95cd8136d 100644 --- a/arch/arm/mach-omap2/omap-secure.c +++ b/arch/arm/mach-omap2/omap-secure.c @@ -72,6 +72,7 @@ phys_addr_t omap_secure_ram_mempool_base(void) return omap_secure_memblock_base; } +#ifdef CONFIG_ARCH_OMAP3 u32 omap3_save_secure_ram(void __iomem *addr, int size) { u32 ret; @@ -90,6 +91,7 @@ u32 omap3_save_secure_ram(void __iomem *addr, int size) return ret; } +#endif /** * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls