diff options
| author | Jerry Hoemann <jerry.hoemann@hpe.com> | 2018-05-03 17:00:55 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@linux-watchdog.org> | 2018-05-21 15:24:42 -0400 |
| commit | 62290a5c194b30a096cbcc6bb8680a5a1e627714 (patch) | |
| tree | 4638bf27786c562b5deb7a95eabd188870ebf1ad | |
| parent | 6c5c0d48b686cca0d3bbd23f66e871323deffd67 (diff) | |
watchdog: hpwdt: Claim NMIs generated by iLO5
On iLO5 going forward we want to return and not claim the NMI, if
the NMI was NOT gnerated by the iLO as a result of the watchdog
timing out or an explicit generate NMI.
The sense of the test in is inverted and prevents hpwdt_pretimeout
from claiming NMIs when it should.
Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com>
Fixes: a042229a18ac ("watchdog: hpwdt: Update nmi_panic message.")
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index a43ab2cecca2..9dc62a461451 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
| @@ -159,7 +159,7 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs) | |||
| 159 | "3. OA Forward Progress Log\n" | 159 | "3. OA Forward Progress Log\n" |
| 160 | "4. iLO Event Log"; | 160 | "4. iLO Event Log"; |
| 161 | 161 | ||
| 162 | if (ilo5 && ulReason == NMI_UNKNOWN && mynmi) | 162 | if (ilo5 && ulReason == NMI_UNKNOWN && !mynmi) |
| 163 | return NMI_DONE; | 163 | return NMI_DONE; |
| 164 | 164 | ||
| 165 | if (ilo5 && !pretimeout) | 165 | if (ilo5 && !pretimeout) |