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

arm64: asm-offsets: remove PREEMPT_DISABLE_OFFSET

The PREEMPT_DISABLE_OFFSET definition was added in commit:

  24534b3511828c66 ("arm64: assembler: add macros to conditionally yield the NEON under PREEMPT")

... but hasn't been used since commit:

  3931261ecf46151a ("arm64: fpsimd: Bring cond_yield asm macro in line with new rules")

Remove PREEMPT_DISABLE_OFFSET.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20241007123921.549340-8-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 e5ffdc0163aad..cb2e9567dca94 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -13,7 +13,6 @@
 #include <linux/kexec.h>
 #include <linux/mm.h>
 #include <linux/kvm_host.h>
-#include <linux/preempt.h>
 #include <linux/suspend.h>
 #include <asm/cpufeature.h>
 #include <asm/fixmap.h>
@@ -95,8 +94,6 @@ int main(void)
   DEFINE(FREGS_SIZE,		sizeof(struct ftrace_regs));
   BLANK();
 #endif
-  DEFINE(PREEMPT_DISABLE_OFFSET, PREEMPT_DISABLE_OFFSET);
-  BLANK();
   DEFINE(CPU_BOOT_TASK,		offsetof(struct secondary_data, task));
   BLANK();
   DEFINE(FTR_OVR_VAL_OFFSET,	offsetof(struct arm64_ftr_override, val));