From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 27 Mar 2026 09:23:30 +0000 (+0100)
Subject: 6.12-stable patches
X-Git-Tag: v6.12.79~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cb3d1e29a9b05e9fe8fd3e086d855920c8803e5;p=thirdparty%2Fkernel%2Fstable-queue.git

6.12-stable patches

added patches:
	revert-loongarch-add-machine_kexec_mask_interrupts-implementation.patch
	series
---

diff --git a/queue-6.12/revert-loongarch-add-machine_kexec_mask_interrupts-implementation.patch b/queue-6.12/revert-loongarch-add-machine_kexec_mask_interrupts-implementation.patch
new file mode 100644
index 0000000000..b0b6695629
--- /dev/null
+++ b/queue-6.12/revert-loongarch-add-machine_kexec_mask_interrupts-implementation.patch
@@ -0,0 +1,52 @@
+From chenhuacai@loongson.cn  Fri Mar 27 10:20:19 2026
+From: Huacai Chen <chenhuacai@loongson.cn>
+Date: Fri, 27 Mar 2026 16:47:01 +0800
+Subject: Revert "LoongArch: Add machine_kexec_mask_interrupts() implementation"
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Sasha Levin <sashal@kernel.org>, Huacai Chen <chenhuacai@kernel.org>
+Cc: Xuerui Wang <kernel@xen0n.name>, stable@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Huacai Chen <chenhuacai@loongson.cn>
+Message-ID: <20260327084701.2692699-1-chenhuacai@loongson.cn>
+
+From: Huacai Chen <chenhuacai@loongson.cn>
+
+This reverts commit 429bf3f04c24a1590ed18cd7bf802cf63f937a0f.
+
+6.12.78 backported "kexec: Consolidate machine_kexec_mask_interrupts()
+implementation" so the arch-specific implementation is redundant.
+
+Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/loongarch/kernel/machine_kexec.c |   22 ----------------------
+ 1 file changed, 22 deletions(-)
+
+--- a/arch/loongarch/kernel/machine_kexec.c
++++ b/arch/loongarch/kernel/machine_kexec.c
+@@ -136,28 +136,6 @@ void kexec_reboot(void)
+ 	BUG();
+ }
+ 
+-static void machine_kexec_mask_interrupts(void)
+-{
+-	unsigned int i;
+-	struct irq_desc *desc;
+-
+-	for_each_irq_desc(i, desc) {
+-		struct irq_chip *chip;
+-
+-		chip = irq_desc_get_chip(desc);
+-		if (!chip)
+-			continue;
+-
+-		if (chip->irq_eoi && irqd_irq_inprogress(&desc->irq_data))
+-			chip->irq_eoi(&desc->irq_data);
+-
+-		if (chip->irq_mask)
+-			chip->irq_mask(&desc->irq_data);
+-
+-		if (chip->irq_disable && !irqd_irq_disabled(&desc->irq_data))
+-			chip->irq_disable(&desc->irq_data);
+-	}
+-}
+ 
+ #ifdef CONFIG_SMP
+ static void kexec_shutdown_secondary(void *regs)
diff --git a/queue-6.12/series b/queue-6.12/series
new file mode 100644
index 0000000000..4b770d4237
--- /dev/null
+++ b/queue-6.12/series
@@ -0,0 +1 @@
+revert-loongarch-add-machine_kexec_mask_interrupts-implementation.patch