Skip to content

Commit 3401f3a

Browse files
author
Joseph Szczypek
committed
watchdog/hpwdt: Remove redundant test.
JIRA: https://issues.redhat.com/browse/RHEL-104148 Upstream Status: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git commit 2b276d5 Author: Jerry Hoemann <jerry.hoemann@hpe.com> Date: Wed Dec 13 14:53:39 2023 -0700 watchdog/hpwdt: Remove redundant test. ProLiants of vintage to have an iLO 5, no longer send watchdog NMI as an IO CHECK. They are presented to hpwdt_pretimeout as NMI_UNKNOWN. The preceding if statement rejects if !mynmi irrespective of value of pretimeout making this if statement redundant. Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20231213215340.495734-3-jerry.hoemann@hpe.com Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org> Signed-off-by: Joseph Szczypek <jszczype@redhat.com>
1 parent f557180 commit 3401f3a

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

drivers/watchdog/hpwdt.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,6 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs)
181181
if (ulReason == NMI_UNKNOWN && !mynmi)
182182
return NMI_DONE;
183183

184-
if (ilo5 && !pretimeout && !mynmi)
185-
return NMI_DONE;
186-
187184
if (kdumptimeout < 0)
188185
hpwdt_stop();
189186
else if (kdumptimeout == 0)

0 commit comments

Comments
 (0)