diff options
author | Michael Ellerman <[email protected]> | 2023-02-12 22:11:56 +1100 |
---|---|---|
committer | Michael Ellerman <[email protected]> | 2023-02-12 22:11:56 +1100 |
commit | fc8a898cfdbb0e63cfde547715c2031de22e7893 (patch) | |
tree | e1eaae008d673bb68cdc003d72eadc4ba5535a18 /arch/powerpc/kernel/dbell.c | |
parent | 544f823ec7a34332550f22735959d3e1ffcf4684 (diff) | |
parent | 2ea31e2e62bbc4d11c411eeb36f1b02841dbcab1 (diff) |
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/dbell.c')
-rw-r--r-- | arch/powerpc/kernel/dbell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/dbell.c b/arch/powerpc/kernel/dbell.c index f55c6fb34a3a..5712dd846263 100644 --- a/arch/powerpc/kernel/dbell.c +++ b/arch/powerpc/kernel/dbell.c @@ -27,7 +27,7 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(doorbell_exception) ppc_msgsync(); - if (should_hard_irq_enable()) + if (should_hard_irq_enable(regs)) do_hard_irq_enable(); kvmppc_clear_host_ipi(smp_processor_id()); |