Skip to content

Commit 014966d

Browse files
Sven Schnellehdeller
authored andcommitted
parisc: don't enable irqs unconditionally in handle_interruption()
If the previous context had interrupts disabled, we should better keep them disabled. This was noticed in the unwinding code where a copy_from_kernel_nofault() triggered a page fault, and after the fixup by the page fault handler interrupts where suddenly enabled. Signed-off-by: Sven Schnelle <svens@stackframe.org> Signed-off-by: Helge Deller <deller@gmx.de>
1 parent 7ddb58c commit 014966d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/parisc/kernel/traps.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
481481

482482
if (code == 1)
483483
pdc_console_restart(); /* switch back to pdc if HPMC */
484-
else
484+
else if (!irqs_disabled_flags(regs->gr[0]))
485485
local_irq_enable();
486486

487487
/* Security check:

0 commit comments

Comments
 (0)