From: Greg Kroah-Hartman Date: Tue, 17 Jun 2025 13:55:56 +0000 (+0200) Subject: 6.15-stable patches X-Git-Tag: v6.6.94~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6be2fe32a1733596bbecc82c70d8a5d35e49d905;p=thirdparty%2Fkernel%2Fstable-queue.git 6.15-stable patches added patches: powerpc-kernel-fix-ppc_save_regs-inclusion-in-build.patch --- diff --git a/queue-6.15/powerpc-kernel-fix-ppc_save_regs-inclusion-in-build.patch b/queue-6.15/powerpc-kernel-fix-ppc_save_regs-inclusion-in-build.patch new file mode 100644 index 0000000000..d69b92e464 --- /dev/null +++ b/queue-6.15/powerpc-kernel-fix-ppc_save_regs-inclusion-in-build.patch @@ -0,0 +1,47 @@ +From 93bd4a80efeb521314485a06d8c21157240497bb Mon Sep 17 00:00:00 2001 +From: Madhavan Srinivasan +Date: Sun, 11 May 2025 09:41:11 +0530 +Subject: powerpc/kernel: Fix ppc_save_regs inclusion in build + +From: Madhavan Srinivasan + +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 +Link: https://patch.msgid.link/20250511041111.841158-1-maddy@linux.ibm.com +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/kernel/Makefile | 2 -- + 1 file changed, 2 deletions(-) + +--- a/arch/powerpc/kernel/Makefile ++++ b/arch/powerpc/kernel/Makefile +@@ -160,9 +160,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 diff --git a/queue-6.15/series b/queue-6.15/series index c6e6a69c18..ba8410060c 100644 --- a/queue-6.15/series +++ b/queue-6.15/series @@ -747,3 +747,4 @@ revert-mm-execmem-unify-early-execmem_cache-behaviour.patch alsa-usb-audio-kill-timer-properly-at-removal.patch alsa-usb-audio-add-implicit-feedback-quirk-for-rode-ai-1.patch hid-usbhid-eliminate-recurrent-out-of-bounds-bug-in-usbhid_parse.patch +powerpc-kernel-fix-ppc_save_regs-inclusion-in-build.patch