summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/time.c
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2021-01-30 23:08:44 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2021-02-09 00:10:49 +1100
commit1b1b6a6f4cc0ecc27745fa578cbaf912d76dbdda (patch)
tree97a1d775ba41dd531f4a237bef7655d4c1821b42 /arch/powerpc/kernel/time.c
parent6fdb0f410bb026ade092039a6c2655a53323c996 (diff)
downloadlinux-stable-1b1b6a6f4cc0ecc27745fa578cbaf912d76dbdda.tar.gz
linux-stable-1b1b6a6f4cc0ecc27745fa578cbaf912d76dbdda.tar.bz2
linux-stable-1b1b6a6f4cc0ecc27745fa578cbaf912d76dbdda.zip
powerpc: handle irq_enter/irq_exit in interrupt handler wrappers
Move irq_enter/irq_exit into asynchronous interrupt handler wrappers. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20210130130852.2952424-35-npiggin@gmail.com
Diffstat (limited to 'arch/powerpc/kernel/time.c')
-rw-r--r--arch/powerpc/kernel/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 7636773b028f..b67d93a609a2 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -611,7 +611,7 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(timer_interrupt)
#endif
old_regs = set_irq_regs(regs);
- irq_enter();
+
trace_timer_interrupt_entry(regs);
if (test_irq_work_pending()) {
@@ -636,7 +636,7 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(timer_interrupt)
}
trace_timer_interrupt_exit(regs);
- irq_exit();
+
set_irq_regs(old_regs);
}
EXPORT_SYMBOL(timer_interrupt);