From patchwork Thu Aug 24 11:44:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Belloni X-Patchwork-Id: 9919873 Return-Path: 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 905DB60327 for ; Thu, 24 Aug 2017 11:45:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A67728B7C for ; Thu, 24 Aug 2017 11:45:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F2AD28B8E; Thu, 24 Aug 2017 11:45:26 +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=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3147528B7C for ; Thu, 24 Aug 2017 11:45:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=vZ6Su3KJ5JSYCB1SCchN7Pfi14aDGL2cXGAO5OeOFkI=; b=L+c 0q4q9F7kyRawHoAzhf0l5C3R1PdlxN2cMJgrKyAEknrzDjQvknOHfOl1KVF3G/g0d8L5y1dILE4zj GbASehQQ1uAUFhtEU4X+buNWvjM8rbkOswbzKeHqDUnMaU5ai2NtcPvwEgdag1aclyBFiUitaROZd UMTVYb5JJt1uFYd7I78tGx/UvgnvqjKXvCt23kp0/LHhkOdoHlHinWeNQ3f55ksDK3SuKYhaerkEa hcCmQ9vTXicSt1ZUU5H4KzvaCfu7qHsHZOs97xLrgUs+mRSBdXRU8JdlTsnya2YZnuAykfeYHRb3m wS8dcK+OicSbdvbqBwyPvjdnqZeEoWg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dkqZe-0001Jj-9q; Thu, 24 Aug 2017 11:45:22 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dkqZZ-0008HS-RD for linux-arm-kernel@lists.infradead.org; Thu, 24 Aug 2017 11:45:19 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 3B1E6209B0; Thu, 24 Aug 2017 13:44:56 +0200 (CEST) Received: from localhost (unknown [88.191.26.124]) by mail.free-electrons.com (Postfix) with ESMTPSA id 14AAA20990; Thu, 24 Aug 2017 13:44:56 +0200 (CEST) From: Alexandre Belloni To: Nicolas Ferre Subject: [PATCH] ARM: at91: Replace uses of virt_to_phys with __pa_symbol Date: Thu, 24 Aug 2017 13:44:54 +0200 Message-Id: <20170824114454.22812-1-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 2.14.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170824_044518_069988_ADF45ACA X-CRM114-Status: GOOD ( 10.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Fainelli , Ludovic Desroches , Alexandre Belloni , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The PM code wrongly uses virt_to_phys() instead of __pa_symbol() and was not updated by commit 64fc2a947a98 ("ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol") because it was not yet in tree. Signed-off-by: Alexandre Belloni Acked-by: Nicolas Ferre --- arch/arm/mach-at91/pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index b1a59d638321..ccaaaa138d13 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -535,8 +535,8 @@ static void __init at91_pm_backup_init(void) } pm_bu->suspended = 0; - pm_bu->canary = virt_to_phys(&canary); - pm_bu->resume = virt_to_phys(cpu_resume); + pm_bu->canary = __pa_symbol(&canary); + pm_bu->resume = __pa_symbol(cpu_resume); return;