diff options
-rw-r--r-- | drivers/watchdog/hpwdt.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 171d5033d7b5..68e84a212d00 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
@@ -36,9 +36,6 @@ static bool ilo5; | |||
36 | static unsigned int soft_margin = DEFAULT_MARGIN; /* in seconds */ | 36 | static unsigned int soft_margin = DEFAULT_MARGIN; /* in seconds */ |
37 | static unsigned int reload; /* the computed soft_margin */ | 37 | static unsigned int reload; /* the computed soft_margin */ |
38 | static bool nowayout = WATCHDOG_NOWAYOUT; | 38 | static bool nowayout = WATCHDOG_NOWAYOUT; |
39 | #ifdef CONFIG_HPWDT_NMI_DECODING | ||
40 | static unsigned int allow_kdump = 1; | ||
41 | #endif | ||
42 | 39 | ||
43 | static void __iomem *pci_mem_addr; /* the PCI-memory address */ | 40 | static void __iomem *pci_mem_addr; /* the PCI-memory address */ |
44 | static unsigned long __iomem *hpwdt_nmistat; | 41 | static unsigned long __iomem *hpwdt_nmistat; |
@@ -124,8 +121,7 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs) | |||
124 | if (ilo5 && ulReason == NMI_UNKNOWN && mynmi) | 121 | if (ilo5 && ulReason == NMI_UNKNOWN && mynmi) |
125 | return NMI_DONE; | 122 | return NMI_DONE; |
126 | 123 | ||
127 | if (allow_kdump) | 124 | hpwdt_stop(); |
128 | hpwdt_stop(); | ||
129 | 125 | ||
130 | hex_byte_pack(panic_msg, mynmi); | 126 | hex_byte_pack(panic_msg, mynmi); |
131 | nmi_panic(regs, panic_msg); | 127 | nmi_panic(regs, panic_msg); |
@@ -186,9 +182,8 @@ static int hpwdt_init_nmi_decoding(struct pci_dev *dev) | |||
186 | goto error2; | 182 | goto error2; |
187 | 183 | ||
188 | dev_info(&dev->dev, | 184 | dev_info(&dev->dev, |
189 | "HPE Watchdog Timer Driver: NMI decoding initialized" | 185 | "HPE Watchdog Timer Driver: NMI decoding initialized\n"); |
190 | ", allow kernel dump: %s (default = 1/ON)\n", | 186 | |
191 | (allow_kdump == 0) ? "OFF" : "ON"); | ||
192 | return 0; | 187 | return 0; |
193 | 188 | ||
194 | error2: | 189 | error2: |
@@ -322,9 +317,4 @@ module_param(nowayout, bool, 0); | |||
322 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" | 317 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" |
323 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); | 318 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); |
324 | 319 | ||
325 | #ifdef CONFIG_HPWDT_NMI_DECODING | ||
326 | module_param(allow_kdump, int, 0); | ||
327 | MODULE_PARM_DESC(allow_kdump, "Start a kernel dump after NMI occurs"); | ||
328 | #endif /* CONFIG_HPWDT_NMI_DECODING */ | ||
329 | |||
330 | module_pci_driver(hpwdt_driver); | 320 | module_pci_driver(hpwdt_driver); |