diff options
authorHATAYAMA Daisuke <>2015-06-30 14:57:43 -0700
committerLinus Torvalds <>2015-06-30 19:44:57 -0700
commitf45d85ff1f3f13d5b67fecb291edc6a771db0c53 (patch)
parenta846f47962e4643b33847c9a0b2b6387f02a93be (diff)
kernel/panic: call the 2nd crash_kexec() only if crash_kexec_post_notifiers is enabled
For compatibility with the behaviour before the commit f06e5153f4ae2e ("kernel/panic.c: add "crash_kexec_post_notifiers" option for kdump after panic_notifers"), the 2nd crash_kexec() should be called only if crash_kexec_post_notifiers is enabled. Note that crash_kexec() returns immediately if kdump crash kernel is not loaded, so in this case, this patch makes no functionality change, but the point is to make it explicit, from the caller panic() side, that the 2nd crash_kexec() does nothing. Signed-off-by: HATAYAMA Daisuke <> Suggested-by: Ingo Molnar <> Cc: "Eric W. Biederman" <> Cc: Vivek Goyal <> Cc: Masami Hiramatsu <> Cc: Hidehiro Kawai <> Cc: Baoquan He <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 8136ad76e5fd..774614f72cbd 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -142,7 +142,8 @@ void panic(const char *fmt, ...)
* Note: since some panic_notifiers can make crashed kernel
* more unstable, it can increase risks of the kdump failure too.
- crash_kexec(NULL);
+ if (crash_kexec_post_notifiers)
+ crash_kexec(NULL);