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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 DFCD1C4338F for ; Fri, 20 Aug 2021 11:04:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B4B8860FDC for ; Fri, 20 Aug 2021 11:04:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239348AbhHTLFJ (ORCPT ); Fri, 20 Aug 2021 07:05:09 -0400 Received: from foss.arm.com ([217.140.110.172]:59150 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233437AbhHTLFH (ORCPT ); Fri, 20 Aug 2021 07:05:07 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7BA31101E; Fri, 20 Aug 2021 04:04:29 -0700 (PDT) Received: from p8cg001049571a15.arm.com (unknown [10.163.69.60]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C517E3F70D; Fri, 20 Aug 2021 04:04:27 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org Cc: Anshuman Khandual , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org Subject: [PATCH V2] arm64/mm: Drop Date: Fri, 20 Aug 2021 16:35:16 +0530 Message-Id: <1629457516-32306-1-git-send-email-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PAGE_SHIFT (PAGE_SIZE and PAGE_MASK) which is derived from ARM64_PAGE_SHIFT should be moved into instead like in case for other platforms, and then subsequently can be just dropped off completely. Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual --- This applies on 5.14-rc6. Changes in V2: - Moved PAGE_XXX macros into instead of - Changed the commit message accordingly Changes in V1: https://lore.kernel.org/lkml/1629441331-19530-1-git-send-email-anshuman.khandual@arm.com/ arch/arm64/include/asm/memory.h | 2 +- arch/arm64/include/asm/page-def.h | 18 ------------------ arch/arm64/include/asm/page.h | 4 +++- 3 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 arch/arm64/include/asm/page-def.h diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 824a3655dd93..649d26396f9e 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -12,7 +12,7 @@ #include #include -#include +#include /* * Size of the PCI I/O space. This must remain a power of two so that diff --git a/arch/arm64/include/asm/page-def.h b/arch/arm64/include/asm/page-def.h deleted file mode 100644 index 2403f7b4cdbf..000000000000 --- a/arch/arm64/include/asm/page-def.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Based on arch/arm/include/asm/page.h - * - * Copyright (C) 1995-2003 Russell King - * Copyright (C) 2017 ARM Ltd. - */ -#ifndef __ASM_PAGE_DEF_H -#define __ASM_PAGE_DEF_H - -#include - -/* PAGE_SHIFT determines the page size */ -#define PAGE_SHIFT CONFIG_ARM64_PAGE_SHIFT -#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) - -#endif /* __ASM_PAGE_DEF_H */ diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h index 993a27ea6f54..95c58b00bb71 100644 --- a/arch/arm64/include/asm/page.h +++ b/arch/arm64/include/asm/page.h @@ -8,7 +8,9 @@ #ifndef __ASM_PAGE_H #define __ASM_PAGE_H -#include +#define PAGE_SHIFT CONFIG_ARM64_PAGE_SHIFT +#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) +#define PAGE_MASK (~(PAGE_SIZE-1)) #ifndef __ASSEMBLY__ -- 2.20.1