summaryrefslogtreecommitdiffstats
path: root/kernel/kexec.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2013-04-16 07:23:47 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2013-04-17 21:35:33 +0200
commit55a20ee7804ab64ac90bcdd4e2868a42829e2784 (patch)
treeae8701054b3da8ac5d46d1cbdbb9c67a5ebd0591 /kernel/kexec.c
parentx86, kdump: Set crashkernel_low automatically (diff)
downloadlinux-55a20ee7804ab64ac90bcdd4e2868a42829e2784.tar.xz
linux-55a20ee7804ab64ac90bcdd4e2868a42829e2784.zip
x86, kdump: Retore crashkernel= to allocate under 896M
Vivek found old kexec-tools does not work new kernel anymore. So change back crashkernel= back to old behavoir, and add crashkernel_high= to let user decide if buffer could be above 4G, and also new kexec-tools will be needed. -v2: let crashkernel=X override crashkernel_high= update description about _high will be ignored by crashkernel=X -v3: update description about kernel-parameters.txt according to Vivek. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Link: http://lkml.kernel.org/r/1366089828-19692-4-git-send-email-yinghai@kernel.org Acked-by: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'kernel/kexec.c')
-rw-r--r--kernel/kexec.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c
index bddd3d7a74b6..1b2f73f5f9b9 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1422,6 +1422,15 @@ int __init parse_crashkernel(char *cmdline,
"crashkernel=");
}
+int __init parse_crashkernel_high(char *cmdline,
+ unsigned long long system_ram,
+ unsigned long long *crash_size,
+ unsigned long long *crash_base)
+{
+ return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
+ "crashkernel_high=");
+}
+
int __init parse_crashkernel_low(char *cmdline,
unsigned long long system_ram,
unsigned long long *crash_size,