]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.6-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 8 Jul 2025 15:36:59 +0000 (17:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 8 Jul 2025 15:36:59 +0000 (17:36 +0200)
added patches:
powerpc-kernel-fix-ppc_save_regs-inclusion-in-build.patch

queue-6.6/powerpc-kernel-fix-ppc_save_regs-inclusion-in-build.patch [new file with mode: 0644]
queue-6.6/series

diff --git a/queue-6.6/powerpc-kernel-fix-ppc_save_regs-inclusion-in-build.patch b/queue-6.6/powerpc-kernel-fix-ppc_save_regs-inclusion-in-build.patch
new file mode 100644 (file)
index 0000000..99cea37
--- /dev/null
@@ -0,0 +1,48 @@
+From 93bd4a80efeb521314485a06d8c21157240497bb Mon Sep 17 00:00:00 2001
+From: Madhavan Srinivasan <maddy@linux.ibm.com>
+Date: Sun, 11 May 2025 09:41:11 +0530
+Subject: powerpc/kernel: Fix ppc_save_regs inclusion in build
+
+From: Madhavan Srinivasan <maddy@linux.ibm.com>
+
+commit 93bd4a80efeb521314485a06d8c21157240497bb upstream.
+
+Recent patch fixed an old commit
+'fc2a5a6161a2 ("powerpc/64s: ppc_save_regs is now needed for all 64s builds")'
+which is to include building of ppc_save_reg.c only when XMON
+and KEXEC_CORE and PPC_BOOK3S are enabled. This was valid, since
+ppc_save_regs was called only in replay_system_reset() of old
+irq.c which was under BOOK3S.
+
+But there has been multiple refactoring of irq.c and have
+added call to ppc_save_regs() from __replay_soft_interrupts
+-> replay_soft_interrupts which is part of irq_64.c included
+under CONFIG_PPC64. And since ppc_save_regs is called in
+CRASH_DUMP path as part of crash_setup_regs in kexec.h,
+CONFIG_PPC32 also needs it.
+
+So with this recent patch which enabled the building of
+ppc_save_regs.c caused a build break when none of these
+(XMON, KEXEC_CORE, BOOK3S) where enabled as part of config.
+Patch to enable building of ppc_save_regs.c by defaults.
+
+Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
+Link: https://patch.msgid.link/20250511041111.841158-1-maddy@linux.ibm.com
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/powerpc/kernel/Makefile |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/arch/powerpc/kernel/Makefile
++++ b/arch/powerpc/kernel/Makefile
+@@ -165,9 +165,7 @@ endif
+ obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM) += tm.o
+-ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE)$(CONFIG_PPC_BOOK3S),)
+ obj-y                         += ppc_save_regs.o
+-endif
+ obj-$(CONFIG_EPAPR_PARAVIRT)  += epapr_paravirt.o epapr_hcalls.o
+ obj-$(CONFIG_KVM_GUEST)               += kvm.o kvm_emul.o
index 77f7b7131b280bb1566e1492cc900f0e3019bc6e..4723c772845eccfe783b546d7a5c709b920f5f3d 100644 (file)
@@ -124,3 +124,4 @@ platform-x86-think-lmi-create-ksets-consecutively.patch
 platform-x86-think-lmi-fix-kobject-cleanup.patch
 platform-x86-think-lmi-fix-sysfs-group-cleanup.patch
 usb-typec-displayport-fix-potential-deadlock.patch
+powerpc-kernel-fix-ppc_save_regs-inclusion-in-build.patch