From: Mark Rutland <mark.rutland@arm.com>
Date: Mon, 7 Oct 2024 12:39:19 +0000 (+0100)
Subject: arm64: asm-offsets: remove VM_EXEC and PAGE_SZ
X-Git-Tag: v6.13-rc1~203^2~2^4~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ce689b4480a528f8d088c71d26744944e360f76;p=thirdparty%2Fkernel%2Flinux.git

arm64: asm-offsets: remove VM_EXEC and PAGE_SZ

The VM_EXEC definition duplicates the common VM_EXEC definition from
<linux/mm.h>. The common definition cannot safely be included by
assembly code but currently we don't need to use VM_EXEC in assembly.

The PAGE_SZ definition duplicates arm64's definition of PAGE_SIZE from
<asm/page-def.h> which can safely be included from assembly code and
should be used directly.

Remove the duplicate definitions.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20241007123921.549340-6-mark.rutland@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index e6a6b5160f75e..7c7c8d98256f9 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -96,10 +96,6 @@ int main(void)
   DEFINE(FREGS_SIZE,		sizeof(struct ftrace_regs));
   BLANK();
 #endif
-  DEFINE(VM_EXEC,	       	VM_EXEC);
-  BLANK();
-  DEFINE(PAGE_SZ,	       	PAGE_SIZE);
-  BLANK();
   DEFINE(DMA_TO_DEVICE,		DMA_TO_DEVICE);
   DEFINE(DMA_FROM_DEVICE,	DMA_FROM_DEVICE);
   BLANK();