diff options
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 7ce73170fa37..99aa76c489a3 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
| @@ -126,7 +126,7 @@ struct cmn_registers { | |||
| 126 | u32 reflags; | 126 | u32 reflags; |
| 127 | } __attribute__((packed)); | 127 | } __attribute__((packed)); |
| 128 | 128 | ||
| 129 | static unsigned int hpwdt_nmi_sourcing; | 129 | static unsigned int hpwdt_nmi_decoding; |
| 130 | static unsigned int allow_kdump; | 130 | static unsigned int allow_kdump; |
| 131 | static unsigned int priority; /* hpwdt at end of die_notify list */ | 131 | static unsigned int priority; /* hpwdt at end of die_notify list */ |
| 132 | static DEFINE_SPINLOCK(rom_lock); | 132 | static DEFINE_SPINLOCK(rom_lock); |
| @@ -467,7 +467,7 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason, | |||
| 467 | if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI) | 467 | if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI) |
| 468 | goto out; | 468 | goto out; |
| 469 | 469 | ||
| 470 | if (!hpwdt_nmi_sourcing) | 470 | if (!hpwdt_nmi_decoding) |
| 471 | goto out; | 471 | goto out; |
| 472 | 472 | ||
| 473 | spin_lock_irqsave(&rom_lock, rom_pl); | 473 | spin_lock_irqsave(&rom_lock, rom_pl); |
| @@ -634,23 +634,23 @@ static struct notifier_block die_notifier = { | |||
| 634 | */ | 634 | */ |
| 635 | 635 | ||
| 636 | #ifdef ARCH_HAS_NMI_WATCHDOG | 636 | #ifdef ARCH_HAS_NMI_WATCHDOG |
| 637 | static void __devinit hpwdt_check_nmi_sourcing(struct pci_dev *dev) | 637 | static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev) |
| 638 | { | 638 | { |
| 639 | /* | 639 | /* |
| 640 | * If nmi_watchdog is turned off then we can turn on | 640 | * If nmi_watchdog is turned off then we can turn on |
| 641 | * our nmi sourcing capability. | 641 | * our nmi decoding capability. |
| 642 | */ | 642 | */ |
| 643 | if (!nmi_watchdog_active()) | 643 | if (!nmi_watchdog_active()) |
| 644 | hpwdt_nmi_sourcing = 1; | 644 | hpwdt_nmi_decoding = 1; |
| 645 | else | 645 | else |
| 646 | dev_warn(&dev->dev, "NMI sourcing is disabled. To enable this " | 646 | dev_warn(&dev->dev, "NMI decoding is disabled. To enable this " |
| 647 | "functionality you must reboot with nmi_watchdog=0 " | 647 | "functionality you must reboot with nmi_watchdog=0 " |
| 648 | "and load the hpwdt driver with priority=1.\n"); | 648 | "and load the hpwdt driver with priority=1.\n"); |
| 649 | } | 649 | } |
| 650 | #else | 650 | #else |
| 651 | static void __devinit hpwdt_check_nmi_sourcing(struct pci_dev *dev) | 651 | static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev) |
| 652 | { | 652 | { |
| 653 | dev_warn(&dev->dev, "NMI sourcing is disabled. " | 653 | dev_warn(&dev->dev, "NMI decoding is disabled. " |
| 654 | "Your kernel does not support a NMI Watchdog.\n"); | 654 | "Your kernel does not support a NMI Watchdog.\n"); |
| 655 | } | 655 | } |
| 656 | #endif | 656 | #endif |
| @@ -661,9 +661,9 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, | |||
| 661 | int retval; | 661 | int retval; |
| 662 | 662 | ||
| 663 | /* | 663 | /* |
| 664 | * Check if we can do NMI sourcing or not | 664 | * Check if we can do NMI decoding or not |
| 665 | */ | 665 | */ |
| 666 | hpwdt_check_nmi_sourcing(dev); | 666 | hpwdt_check_nmi_decoding(dev); |
| 667 | 667 | ||
| 668 | /* | 668 | /* |
| 669 | * First let's find out if we are on an iLO2+ server. We will | 669 | * First let's find out if we are on an iLO2+ server. We will |
