From 7d837342f30f0baf79229c86a9bb5e244667a6b5 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Tue, 27 Jul 2010 17:51:01 -0600 Subject: [PATCH] --- yaml --- r: 209322 b: refs/heads/master c: 34572b29dd1db23a36f9cc46abf1c9acf85f8cfe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/hpwdt.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 13cf5568300b..febad27876ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 243066bad7e4ff5072b4e67063c4298d5bbba9cd +refs/heads/master: 34572b29dd1db23a36f9cc46abf1c9acf85f8cfe diff --git a/trunk/drivers/watchdog/hpwdt.c b/trunk/drivers/watchdog/hpwdt.c index 7ce73170fa37..99aa76c489a3 100644 --- a/trunk/drivers/watchdog/hpwdt.c +++ b/trunk/drivers/watchdog/hpwdt.c @@ -126,7 +126,7 @@ struct cmn_registers { u32 reflags; } __attribute__((packed)); -static unsigned int hpwdt_nmi_sourcing; +static unsigned int hpwdt_nmi_decoding; static unsigned int allow_kdump; static unsigned int priority; /* hpwdt at end of die_notify list */ static DEFINE_SPINLOCK(rom_lock); @@ -467,7 +467,7 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason, if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI) goto out; - if (!hpwdt_nmi_sourcing) + if (!hpwdt_nmi_decoding) goto out; spin_lock_irqsave(&rom_lock, rom_pl); @@ -634,23 +634,23 @@ static struct notifier_block die_notifier = { */ #ifdef ARCH_HAS_NMI_WATCHDOG -static void __devinit hpwdt_check_nmi_sourcing(struct pci_dev *dev) +static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev) { /* * If nmi_watchdog is turned off then we can turn on - * our nmi sourcing capability. + * our nmi decoding capability. */ if (!nmi_watchdog_active()) - hpwdt_nmi_sourcing = 1; + hpwdt_nmi_decoding = 1; else - dev_warn(&dev->dev, "NMI sourcing is disabled. To enable this " + 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_sourcing(struct pci_dev *dev) +static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev) { - dev_warn(&dev->dev, "NMI sourcing is disabled. " + dev_warn(&dev->dev, "NMI decoding is disabled. " "Your kernel does not support a NMI Watchdog.\n"); } #endif @@ -661,9 +661,9 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, int retval; /* - * Check if we can do NMI sourcing or not + * Check if we can do NMI decoding or not */ - hpwdt_check_nmi_sourcing(dev); + hpwdt_check_nmi_decoding(dev); /* * First let's find out if we are on an iLO2+ server. We will