powerpc: convert interrupt handlers to use wrappers

[linux-2.6-microblaze.git] / arch / powerpc / kernel / watchdog.c

diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c
index 3ae13c2..be6b228 100644 (file)
--- 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)