mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
ipmi/watchdog: use nmi_panic() when kernel panics in NMI handler
Commit1717f2096b
("panic, x86: Fix re-entrance problem due to panic on NMI") introduced nmi_panic() which prevents concurrent and recursive execution of panic(). It also saves registers for the crash dump on x86 by later commit58c5661f21
("panic, x86: Allow CPUs to save registers even if looping in NMI context"). ipmi_watchdog driver can call panic() from NMI handler, so replace it with nmi_panic(). Signed-off-by: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com> Acked-by: Corey Minyard <cminyard@mvista.com> Acked-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ebc41f20d7
commit
73cbf4a1dd
1 changed files with 1 additions and 1 deletions
|
@ -1140,7 +1140,7 @@ ipmi_nmi(unsigned int val, struct pt_regs *regs)
|
|||
the timer. So do so. */
|
||||
pretimeout_since_last_heartbeat = 1;
|
||||
if (atomic_inc_and_test(&preop_panic_excl))
|
||||
panic(PFX "pre-timeout");
|
||||
nmi_panic(regs, PFX "pre-timeout");
|
||||
}
|
||||
|
||||
return NMI_HANDLED;
|
||||
|
|
Loading…
Reference in a new issue