From patchwork Fri Mar 8 14:25:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris von Recklinghausen X-Patchwork-Id: 10845013 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 552A51575 for ; Fri, 8 Mar 2019 14:25:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D59E2E095 for ; Fri, 8 Mar 2019 14:25:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 316A82EA14; Fri, 8 Mar 2019 14:25:40 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 DB8A42E095 for ; Fri, 8 Mar 2019 14:25:39 +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:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=TacrqBHNGo+4ZGTQC1FrYhQEbOxMHO+5YXYn+vd9eos=; b=l92s06Z2o6esrw /Z0JpaiWnYVPKnz4F/3aXht0LIVpO+anR12llofbErl5riuwPRElAFlFVTm2ycfQy7MaXfYBeGUo7 cD7g+207o+nexS3GbviAY0lq2v+WIQVKtxlz06JQI+COtyRY6qMPbKiPKXlepc5WwhmHCLKNAoDzK C+f+u2bK7fz0DrdXaIMQWy78Qv4U8uXnSNlIhwjWBo/chJg8vkMlWVfNSennB+kvpC6M1kkGBq1yr Zs8IpMIHyi3J9VYAfXc/bEB42hx3/u/saVKyyULGkCznLo+lRDdP9PyS9Ly8zLVrHGgRZWqrIs/rc agSu2HxNpI99IzrMjw5g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h2GRI-0003DT-VU; Fri, 08 Mar 2019 14:25:32 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h2GRF-0003D9-Rr for linux-arm-kernel@lists.infradead.org; Fri, 08 Mar 2019 14:25:31 +0000 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 11934811DB; Fri, 8 Mar 2019 14:25:29 +0000 (UTC) Received: from crecklin.bos.com (dhcp-17-195.bos.redhat.com [10.18.17.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id 969BC1001E6E; Fri, 8 Mar 2019 14:25:28 +0000 (UTC) From: Chris von Recklinghausen To: Steve.Capper@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH] 52-bit kernel + user VAs - remove arm64 definitions of kc_vaddr_to_offset and kc_offset_to_vaddr. Date: Fri, 8 Mar 2019 09:25:27 -0500 Message-Id: <20190308142527.22892-1-crecklin@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 08 Mar 2019 14:25:29 +0000 (UTC) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190308_062529_924337_1CB392D0 X-CRM114-Status: GOOD ( 11.41 ) 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: , 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 remove arm64 definitions of kc_vaddr_to_offset and kc_offset_to_vaddr. With the reshuffling of kernel VA space to support 52 bits, the kc_vaddr_to_offset and kc_offset_to_vaddr macros are broken, since they are based on VA_START, but VA_START no longer points to the base of the kernel virtual address space, (PAGE_OFFSET does now). fs/proc/kcore.c already has default definitions of kc_vaddr_to_offset and kc_offset_to_vaddr based on PAGE_OFFSET, so simply remove the arm64 definitions of them. Fixes: ("arm64: mm: Flip kernel VA space") --- arch/arm64/include/asm/pgtable.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 766def2ed788..a332258258fc 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -831,9 +831,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, #define update_mmu_cache_pmd(vma, address, pmd) do { } while (0) -#define kc_vaddr_to_offset(v) ((v) & ~VA_START) -#define kc_offset_to_vaddr(o) ((o) | VA_START) - #ifdef CONFIG_ARM64_PA_BITS_52 #define phys_to_ttbr(addr) (((addr) | ((addr) >> 46)) & TTBR_BADDR_MASK_52) #else