Skip to content

Commit 5f23da1

Browse files
committed
Merge remote-tracking branch 'stable/linux-6.12.y' into rpi-6.12.y
2 parents b7240ab + c2d104a commit 5f23da1

2 files changed

Lines changed: 1 addition & 23 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 12
4-
SUBLEVEL = 78
4+
SUBLEVEL = 79
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

arch/loongarch/kernel/machine_kexec.c

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -136,28 +136,6 @@ void kexec_reboot(void)
136136
BUG();
137137
}
138138

139-
static void machine_kexec_mask_interrupts(void)
140-
{
141-
unsigned int i;
142-
struct irq_desc *desc;
143-
144-
for_each_irq_desc(i, desc) {
145-
struct irq_chip *chip;
146-
147-
chip = irq_desc_get_chip(desc);
148-
if (!chip)
149-
continue;
150-
151-
if (chip->irq_eoi && irqd_irq_inprogress(&desc->irq_data))
152-
chip->irq_eoi(&desc->irq_data);
153-
154-
if (chip->irq_mask)
155-
chip->irq_mask(&desc->irq_data);
156-
157-
if (chip->irq_disable && !irqd_irq_disabled(&desc->irq_data))
158-
chip->irq_disable(&desc->irq_data);
159-
}
160-
}
161139

162140
#ifdef CONFIG_SMP
163141
static void kexec_shutdown_secondary(void *regs)

0 commit comments

Comments
 (0)