From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EFEBC433E2 for ; Wed, 16 Sep 2020 00:27:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 030C020663 for ; Wed, 16 Sep 2020 00:27:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726856AbgIPA1g (ORCPT ); Tue, 15 Sep 2020 20:27:36 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:12292 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726786AbgIOOHW (ORCPT ); Tue, 15 Sep 2020 10:07:22 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 2F4DA13AB342F56E3D49; Tue, 15 Sep 2020 21:19:13 +0800 (CST) Received: from thunder-town.china.huawei.com (10.174.177.253) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Tue, 15 Sep 2020 21:19:05 +0800 From: Zhen Lei To: Daniel Lezcano , Thomas Gleixner , Andrew Morton , Russell King , Catalin Marinas , linux-arm-kernel , patches-armlinux , linux-kernel CC: Zhen Lei , Libin , Kefeng Wang , Jianguo Chen Subject: [PATCH v2 1/2] ARM: fix trivial comments in head.S Date: Tue, 15 Sep 2020 21:16:14 +0800 Message-ID: <20200915131615.3138-2-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20200915131615.3138-1-thunder.leizhen@huawei.com> References: <20200915131615.3138-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.174.177.253] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 1. Change pv_offset to __pv_offset. 2. Change PHYS_OFFSET to PHYS_PFN_OFFSET. commit e26a9e00afc4 ("ARM: Better virt_to_page() handling") replaced __pv_phys_offset with __pv_phys_pfn_offset, but forgot updating the related PHYS_OFFSET to PHYS_PFN_OFFSET. #define PHYS_PFN_OFFSET (__pv_phys_pfn_offset) Fixes: f52bb722547f ("ARM: mm: Correct virt_to_phys patching for 64 bit physical addresses") Fixes: e26a9e00afc4 ("ARM: Better virt_to_page() handling") Signed-off-by: Zhen Lei --- arch/arm/kernel/head.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index f8904227e7fdc44..02d78c9198d0e8d 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -612,7 +612,7 @@ __fixup_pv_table: add r6, r6, r3 @ adjust __pv_phys_pfn_offset address add r7, r7, r3 @ adjust __pv_offset address mov r0, r8, lsr #PAGE_SHIFT @ convert to PFN - str r0, [r6] @ save computed PHYS_OFFSET to __pv_phys_pfn_offset + str r0, [r6] @ save computed PHYS_PFN_OFFSET to __pv_phys_pfn_offset strcc ip, [r7, #HIGH_OFFSET] @ save to __pv_offset high bits mov r6, r3, lsr #24 @ constant for add/sub instructions teq r3, r6, lsl #24 @ must be 16MiB aligned @@ -634,8 +634,8 @@ __fixup_a_pv_table: adr r0, 3f ldr r6, [r0] add r6, r6, r3 - ldr r0, [r6, #HIGH_OFFSET] @ pv_offset high word - ldr r6, [r6, #LOW_OFFSET] @ pv_offset low word + ldr r0, [r6, #HIGH_OFFSET] @ __pv_offset high word + ldr r6, [r6, #LOW_OFFSET] @ __pv_offset low word mov r6, r6, lsr #24 cmn r0, #1 #ifdef CONFIG_THUMB2_KERNEL -- 1.8.3