Message ID | 1481068257-6367-8-git-send-email-labbott@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EF5D76022E for <patchwork-linux-arm@patchwork.kernel.org>; Tue, 6 Dec 2016 23:55:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF3A327D85 for <patchwork-linux-arm@patchwork.kernel.org>; Tue, 6 Dec 2016 23:55:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFBC6284D4; Tue, 6 Dec 2016 23:55:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 740DE27D85 for <patchwork-linux-arm@patchwork.kernel.org>; Tue, 6 Dec 2016 23:55:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEPYH-0005Qh-UJ; Tue, 06 Dec 2016 23:53:37 +0000 Received: from mail-qk0-f177.google.com ([209.85.220.177]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEPWU-0003xs-T6 for linux-arm-kernel@lists.infradead.org; Tue, 06 Dec 2016 23:51:48 +0000 Received: by mail-qk0-f177.google.com with SMTP id x190so397678860qkb.0 for <linux-arm-kernel@lists.infradead.org>; Tue, 06 Dec 2016 15:51:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sZo0RTgp+KcxuFDIa275bhcqlEesy+DBfKruXKr/lZo=; b=Mc87HO5ZDRXvA21mp7uFSo5EQvuJSByXBVBLWYPFDbVYqKJBKpwAyyk3YwXHuSMcrt Ler/vVIo+obvwOPyO5GpGdYnMFYUCNCm9czRmPcceOTTtrkCTR2ZpeKM+NHCty7UYqQu 6C8iD1rUM4n3cy2pRv1Kx4XkXB1EUKRwkz2QimMd9AGCBzqRJ3lO94QCuM3daJ57WW7E ixSFotwUUVBZLHWGr5qyNpbPBQmaEjxU7JoVXNSkHsRbXnqNlE20ZbW0DrwA4RWzZuAT Bkcx3qgCcJDC3PCUFJCW5EkZF+722YjWGzDPtV1sKpedYjIvVPhVlh1NLZAESalffJWN W7uA== X-Gm-Message-State: AKaTC00pejgFNm6iT0GOvoB+OkeSWWobify6doFBTybEkCewhKejdECl8HUkTi0sWmTNqUSn X-Received: by 10.55.91.193 with SMTP id p184mr56496063qkb.301.1481068285940; Tue, 06 Dec 2016 15:51:25 -0800 (PST) Received: from labbott-redhat-machine.redhat.com ([2601:602:9800:177f::df9b]) by smtp.gmail.com with ESMTPSA id o190sm2739212qke.5.2016.12.06.15.51.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2016 15:51:24 -0800 (PST) From: Laura Abbott <labbott@redhat.com> To: Mark Rutland <mark.rutland@arm.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Will Deacon <will.deacon@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Subject: [PATCHv5 07/11] drivers: firmware: psci: Use __pa_symbol for kernel symbol Date: Tue, 6 Dec 2016 15:50:53 -0800 Message-Id: <1481068257-6367-8-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481068257-6367-1-git-send-email-labbott@redhat.com> References: <1481068257-6367-1-git-send-email-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161206_155147_284056_4E2A3B0E X-CRM114-Status: GOOD ( 11.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: Marc Zyngier <marc.zyngier@arm.com>, x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Ingo Molnar <mingo@redhat.com>, linux-arm-kernel@lists.infradead.org, "H. Peter Anvin" <hpa@zytor.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Thomas Gleixner <tglx@linutronix.de>, Laura Abbott <labbott@redhat.com>, Andrew Morton <akpm@linux-foundation.org>, Christoffer Dall <christoffer.dall@linaro.org>, Marek Szyprowski <m.szyprowski@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 8263429..9defbe2 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -383,7 +383,7 @@ static int psci_suspend_finisher(unsigned long index) u32 *state = __this_cpu_read(psci_power_state); return psci_ops.cpu_suspend(state[index - 1], - virt_to_phys(cpu_resume)); + __pa_symbol(cpu_resume)); } int psci_cpu_suspend_enter(unsigned long index)
__pa_symbol is technically the macro that should be used for kernel symbols. Switch to this as a pre-requisite for DEBUG_VIRTUAL which will do bounds checking. Signed-off-by: Laura Abbott <labbott@redhat.com> --- v5: Split off from arm64 __pa_symbol conversion --- drivers/firmware/psci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)