summaryrefslogtreecommitdiff
path: root/kexec/kexec.c
diff options
context:
space:
mode:
authorPrarit Bhargava <prarit@redhat.com>2014-12-30 09:57:51 -0500
committerSimon Horman <horms@verge.net.au>2015-01-01 08:15:24 +0900
commit930f0c3734c223433e74037601cbfd1bc9df7bad (patch)
tree782e2ee2cbb989dc7677cb5742f0f2335acccab5 /kexec/kexec.c
parentd1932cd592e2a6aaf50ed22cfa2d7562b583854a (diff)
kexec, remove panic_on_warn kernel parameter from kdump situations
panic_on_warn kernel parameter will cause the kernel to panic when a WARN() is hit in the kernel. This is not a good situation for the kdump kernel because then it would be possible for the kdump kernel to panic in a non-fatal WARN(). This patch removes panic_on_warn as a kernel parameter for the kdump kernel. Signed-off-by: Prarit Bhargava <prarit@redhat.com> Cc: Dave Young <dyoung@redhat.com> Cc: Vivek Goyal <vgoyal@redhat.com> Cc: WANG Chao <chaowang@redhat.com> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/kexec.c')
-rw-r--r--kexec/kexec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kexec/kexec.c b/kexec/kexec.c
index b088916..323cafb 100644
--- a/kexec/kexec.c
+++ b/kexec/kexec.c
@@ -1048,8 +1048,10 @@ char *get_command_line(void)
line[strlen(line) - 1] = '\0';
remove_parameter(line, "BOOT_IMAGE");
- if (kexec_flags & KEXEC_ON_CRASH)
+ if (kexec_flags & KEXEC_ON_CRASH) {
remove_parameter(line, "crashkernel");
+ remove_parameter(line, "panic_on_warn");
+ }
return line;
}