git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
[pandora-kernel.git]
/
drivers
/
watchdog
/
hpwdt.c
diff --git
a/drivers/watchdog/hpwdt.c
b/drivers/watchdog/hpwdt.c
index
3d77116
..
24b966d
100644
(file)
--- a/
drivers/watchdog/hpwdt.c
+++ b/
drivers/watchdog/hpwdt.c
@@
-469,7
+469,7
@@
static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
unsigned long rom_pl;
static int die_nmi_called;
unsigned long rom_pl;
static int die_nmi_called;
- if (ulReason != DIE_NMI
&& ulReason != DIE_NMI_IPI
)
+ if (ulReason != DIE_NMI
UNKNOWN
)
goto out;
if (!hpwdt_nmi_decoding)
goto out;
if (!hpwdt_nmi_decoding)
@@
-642,19
+642,14
@@
static struct notifier_block die_notifier = {
*/
#ifdef CONFIG_HPWDT_NMI_DECODING
*/
#ifdef CONFIG_HPWDT_NMI_DECODING
-#ifdef
ARCH_HAS_NMI_WATCHDOG
+#ifdef
CONFIG_X86_LOCAL_APIC
static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
{
/*
* If nmi_watchdog is turned off then we can turn on
* our nmi decoding capability.
*/
static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
{
/*
* If nmi_watchdog is turned off then we can turn on
* our nmi decoding capability.
*/
- if (!nmi_watchdog_active())
- hpwdt_nmi_decoding = 1;
- else
- dev_warn(&dev->dev, "NMI decoding is disabled. To enable this "
- "functionality you must reboot with nmi_watchdog=0 "
- "and load the hpwdt driver with priority=1.\n");
+ hpwdt_nmi_decoding = 1;
}
#else
static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
}
#else
static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
@@
-662,7
+657,7
@@
static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
dev_warn(&dev->dev, "NMI decoding is disabled. "
"Your kernel does not support a NMI Watchdog.\n");
}
dev_warn(&dev->dev, "NMI decoding is disabled. "
"Your kernel does not support a NMI Watchdog.\n");
}
-#endif /*
ARCH_HAS_NMI_WATCHDOG
*/
+#endif /*
CONFIG_X86_LOCAL_APIC
*/
static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev)
{
static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev)
{