diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2021-01-30 23:08:38 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2021-02-09 00:02:12 +1100 |
| commit | 3a96570ffceb15c6ed9cc6f990f172dcdc8ac279 (patch) | |
| tree | 055ee48f333599bbe86c218f73dd3e29791281b7 /arch/powerpc/kernel/watchdog.c | |
| parent | fd3f1e0f139f1314ff97438eebaa1f9d216e10a2 (diff) | |
| download | linux-stable-3a96570ffceb15c6ed9cc6f990f172dcdc8ac279.tar.gz linux-stable-3a96570ffceb15c6ed9cc6f990f172dcdc8ac279.tar.bz2 linux-stable-3a96570ffceb15c6ed9cc6f990f172dcdc8ac279.zip | |
powerpc: convert interrupt handlers to use 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-29-npiggin@gmail.com
Diffstat (limited to 'arch/powerpc/kernel/watchdog.c')
| -rw-r--r-- | arch/powerpc/kernel/watchdog.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c index 3ae13c2a10cf..be6b22838555 100644 --- a/arch/powerpc/kernel/watchdog.c +++ b/arch/powerpc/kernel/watchdog.c @@ -26,6 +26,7 @@ #include <linux/delay.h> #include <linux/smp.h> +#include <asm/interrupt.h> #include <asm/paca.h> #include <asm/nmi.h> @@ -248,14 +249,14 @@ static void watchdog_timer_interrupt(int cpu) watchdog_smp_panic(cpu, tb); } -void soft_nmi_interrupt(struct pt_regs *regs) +DEFINE_INTERRUPT_HANDLER_NMI(soft_nmi_interrupt) { unsigned long flags; int cpu = raw_smp_processor_id(); u64 tb; if (!cpumask_test_cpu(cpu, &wd_cpus_enabled)) - return; + return 0; nmi_enter(); @@ -292,6 +293,8 @@ void soft_nmi_interrupt(struct pt_regs *regs) out: nmi_exit(); + + return 0; } static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer) |