aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/hpwdt.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 4f1c3e0459ff..2b75e8b47279 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -39,7 +39,7 @@
39#endif /* CONFIG_HPWDT_NMI_DECODING */ 39#endif /* CONFIG_HPWDT_NMI_DECODING */
40#include <asm/nmi.h> 40#include <asm/nmi.h>
41 41
42#define HPWDT_VERSION "1.3.2" 42#define HPWDT_VERSION "1.3.3"
43#define SECS_TO_TICKS(secs) ((secs) * 1000 / 128) 43#define SECS_TO_TICKS(secs) ((secs) * 1000 / 128)
44#define TICKS_TO_SECS(ticks) ((ticks) * 128 / 1000) 44#define TICKS_TO_SECS(ticks) ((ticks) * 128 / 1000)
45#define HPWDT_MAX_TIMER TICKS_TO_SECS(65535) 45#define HPWDT_MAX_TIMER TICKS_TO_SECS(65535)
@@ -501,8 +501,13 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs)
501 "but unable to determine source.\n"); 501 "but unable to determine source.\n");
502 } 502 }
503 } 503 }
504 panic("An NMI occurred, please see the Integrated " 504 panic("An NMI occurred. Depending on your system the reason "
505 "Management Log for details.\n"); 505 "for the NMI is logged in any one of the following "
506 "resources:\n"
507 "1. Integrated Management Log (IML)\n"
508 "2. OA Syslog\n"
509 "3. OA Forward Progress Log\n"
510 "4. iLO Event Log");
506 511
507out: 512out:
508 return NMI_DONE; 513 return NMI_DONE;