aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/nmi.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/kernel/nmi.c')
-rw-r--r--arch/i386/kernel/nmi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index 7b9a053effa3..dbda706fdd14 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -22,6 +22,7 @@
22#include <linux/sysctl.h> 22#include <linux/sysctl.h>
23#include <linux/percpu.h> 23#include <linux/percpu.h>
24#include <linux/dmi.h> 24#include <linux/dmi.h>
25#include <linux/kprobes.h>
25 26
26#include <asm/smp.h> 27#include <asm/smp.h>
27#include <asm/nmi.h> 28#include <asm/nmi.h>
@@ -882,7 +883,7 @@ EXPORT_SYMBOL(touch_nmi_watchdog);
882 883
883extern void die_nmi(struct pt_regs *, const char *msg); 884extern void die_nmi(struct pt_regs *, const char *msg);
884 885
885int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason) 886__kprobes int nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
886{ 887{
887 888
888 /* 889 /*
@@ -962,8 +963,7 @@ int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason)
962 * This matches the old behaviour. 963 * This matches the old behaviour.
963 */ 964 */
964 rc = 1; 965 rc = 1;
965 } else 966 }
966 printk(KERN_WARNING "Unknown enabled NMI hardware?!\n");
967 } 967 }
968done: 968done:
969 return rc; 969 return rc;