summaryrefslogtreecommitdiff
path: root/kexec/kexec.c
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2015-01-05 10:48:43 +0900
committerSimon Horman <horms@verge.net.au>2015-01-05 10:48:43 +0900
commit65ac1bbad6dd6196b5a53640a5e02c6f48f80c6b (patch)
tree494f3b80e9a01211e10c4010bcd8a12c44daa66b /kexec/kexec.c
parent930f0c3734c223433e74037601cbfd1bc9df7bad (diff)
Revert "kexec, remove panic_on_warn kernel parameter from kdump situations"
This reverts commit 930f0c3734c223433e74037601cbfd1bc9df7bad.
Diffstat (limited to 'kexec/kexec.c')
-rw-r--r--kexec/kexec.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kexec/kexec.c b/kexec/kexec.c
index 323cafb..b088916 100644
--- a/kexec/kexec.c
+++ b/kexec/kexec.c
@@ -1048,10 +1048,8 @@ 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;
}