From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 24 Jun 2025 10:26:17 +0000 (+0100)
Subject: update queue-5.10/arm64-move-aarch64_break_fault-into-insn-def.h.patch
X-Git-Tag: v5.4.295~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10ad3fae0f282e60da8b7951e1b01be42d91789a;p=thirdparty%2Fkernel%2Fstable-queue.git

update queue-5.10/arm64-move-aarch64_break_fault-into-insn-def.h.patch

No longer breaks the build
---

diff --git a/queue-5.10/arm64-move-aarch64_break_fault-into-insn-def.h.patch b/queue-5.10/arm64-move-aarch64_break_fault-into-insn-def.h.patch
index 27b5acf722..b685aac42b 100644
--- a/queue-5.10/arm64-move-aarch64_break_fault-into-insn-def.h.patch
+++ b/queue-5.10/arm64-move-aarch64_break_fault-into-insn-def.h.patch
@@ -27,9 +27,10 @@ Signed-off-by: Pu Lehui <pulehui@huawei.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  arch/arm64/include/asm/debug-monitors.h |   12 ------------
- arch/arm64/include/asm/insn.h           |   12 ++++++++++++
- 2 files changed, 12 insertions(+), 12 deletions(-)
+ arch/arm64/include/asm/insn.h           |   13 +++++++++++++
+ 2 files changed, 13 insertions(+), 12 deletions(-)
 
+index c16ed5b68768..e1d166beb99b 100644
 --- a/arch/arm64/include/asm/debug-monitors.h
 +++ b/arch/arm64/include/asm/debug-monitors.h
 @@ -34,18 +34,6 @@
@@ -53,7 +54,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 --- a/arch/arm64/include/asm/insn.h
 +++ b/arch/arm64/include/asm/insn.h
-@@ -13,6 +13,18 @@
+@@ -9,10 +9,23 @@
+ #define	__ASM_INSN_H
+ #include <linux/build_bug.h>
+ #include <linux/types.h>
++#include <asm/brk-imm.h>
+ 
  /* A64 instructions are always 32 bits. */
  #define	AARCH64_INSN_SIZE		4