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/time.c | |
| parent | 544f823ec7a34332550f22735959d3e1ffcf4684 (diff) | |
| parent | 2ea31e2e62bbc4d11c411eeb36f1b02841dbcab1 (diff) | |
| download | linux-fc8a898cfdbb0e63cfde547715c2031de22e7893.tar.gz | |
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/time.c')
| -rw-r--r-- | arch/powerpc/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index b894029f53db1..9d8665910350c 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -515,7 +515,7 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(timer_interrupt) } /* Conditionally hard-enable interrupts. */ - if (should_hard_irq_enable()) { + if (should_hard_irq_enable(regs)) { /* * Ensure a positive value is written to the decrementer, or * else some CPUs will continue to take decrementer exceptions. |