The patch titled
Subject: ipmi/watchdog: use nmi_panic() when kernel panics in NMI handler
has been added to the -mm tree. Its filename is
ipmi-watchdog-use-nmi_panic-when-kernel-panics-in-nmi-handler.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/ipmi-watchdog-use-nmi_panic-when-kernel-panics-in-nmi-handler.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/ipmi-watchdog-use-nmi_panic-when-kernel-panics-in-nmi-handler.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Hidehiro Kawai <hidehiro.kawai.ez@xxxxxxxxxxx>
Subject: ipmi/watchdog: use nmi_panic() when kernel panics in NMI handler
commit 1717f2096b54 ("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 commit 58c5661f2144 ("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@xxxxxxxxxxx>
Acked-by: Corey Minyard <cminyard@xxxxxxxxxx>
Acked-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Reviewed-by: Michal Hocko <mhocko@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/ipmi/ipmi_watchdog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/char/ipmi/ipmi_watchdog.c~ipmi-watchdog-use-nmi_panic-when-kernel-panics-in-nmi-handler drivers/char/ipmi/ipmi_watchdog.c
--- a/drivers/char/ipmi/ipmi_watchdog.c~ipmi-watchdog-use-nmi_panic-when-kernel-panics-in-nmi-handler
+++ a/drivers/char/ipmi/ipmi_watchdog.c
@@ -1140,7 +1140,7 @@ ipmi_nmi(unsigned int val, struct pt_reg
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;
_
Patches currently in -mm which might be from hidehiro.kawai.ez@xxxxxxxxxxx are
panic-change-nmi_panic-from-macro-to-function.patch
ipmi-watchdog-use-nmi_panic-when-kernel-panics-in-nmi-handler.patch
hpwdt-use-nmi_panic-when-kernel-panics-in-nmi-handler.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
