From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Wed, 29 Aug 2012 13:14:04 +0000 (-0700)
Subject: [hpwdt] add include NMI
X-Git-Tag: v2.6.39-400.9.0~342
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=980a525d776d02063d95763eb9998d16f0d715bc;p=users%2Fjedix%2Flinux-maple.git

[hpwdt] add include NMI

Commit:
x86/nmi: Add new NMI queues to deal with IO_CHK and SERR
Added new NMI calls. But skipped to add nmi.h. Fix
merge commit here.
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
---

diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 40fece9f4afd..0c11f14ab903 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -35,6 +35,7 @@
 #include <linux/notifier.h>
 #include <asm/cacheflush.h>
 #endif /* CONFIG_HPWDT_NMI_DECODING */
+#include <asm/nmi.h>
 
 #define HPWDT_VERSION			"1.3.0"
 #define SECS_TO_TICKS(secs)		((secs) * 1000 / 128)