diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2023-02-12 22:11:56 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2023-02-12 22:11:56 +1100 |
| commit | fc8a898cfdbb0e63cfde547715c2031de22e7893 (patch) | |
| tree | e1eaae008d673bb68cdc003d72eadc4ba5535a18 /arch/powerpc/kernel/irq.c | |
| parent | powerpc/ps3: Refresh ps3_defconfig (diff) | |
| parent | powerpc/64s/interrupt: Fix interrupt exit race with security mitigation switch (diff) | |
| download | linux-fc8a898cfdbb0e63cfde547715c2031de22e7893.tar.gz linux-fc8a898cfdbb0e63cfde547715c2031de22e7893.zip | |
Merge branch 'fixes' into next
Merge our fixes branch to bring in some changes that conflict with
upcoming next content.
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
| -rw-r--r-- | arch/powerpc/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index c5b9ce887483..c9535f2760b5 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -238,7 +238,7 @@ static void __do_irq(struct pt_regs *regs, unsigned long oldsp) irq = static_call(ppc_get_irq)(); /* We can hard enable interrupts now to allow perf interrupts */ - if (should_hard_irq_enable()) + if (should_hard_irq_enable(regs)) do_hard_irq_enable(); /* And finally process it */ |