diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 14:28:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 14:28:09 +1100 |
| commit | c903434dd48170f61194d2b38f432c56add44f19 (patch) | |
| tree | 318b51c2fb030e012b78defa580849ac9e135d0e /drivers | |
| parent | 98f7deb43813186d9c8350cac8292e9b832d754d (diff) | |
Revert "x86, nmi_watchdog: Remove all stub function calls from old nmi_watchdog"
This reverts commit 072b198a4ad48bd722ec6d203d65422a4698eae7.
Conflicts:
arch/x86/kernel/smpboot.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/acpica/nsinit.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c index 0cac7ec0d2ec..660a2728908d 100644 --- a/drivers/acpi/acpica/nsinit.c +++ b/drivers/acpi/acpica/nsinit.c @@ -577,7 +577,9 @@ acpi_ns_init_one_device(acpi_handle obj_handle, * as possible (without an NMI being received in the middle of * this) - so disable NMIs and initialize the device: */ + acpi_nmi_disable(); status = acpi_ns_evaluate(info); + acpi_nmi_enable(); if (ACPI_SUCCESS(status)) { walk_info->num_INI++; diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index c19f4a20794a..3d77116e4634 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -649,7 +649,12 @@ 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. */ - hpwdt_nmi_decoding = 1; + 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"); } #else static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev) |