diff options
author | Yinghai Lu <yinghai@kernel.org> | 2013-04-16 01:23:47 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-17 15:35:33 -0400 |
commit | 55a20ee7804ab64ac90bcdd4e2868a42829e2784 (patch) | |
tree | ae8701054b3da8ac5d46d1cbdbb9c67a5ebd0591 /kernel | |
parent | c729de8fcea37a1c444e81857eace12494c804a9 (diff) |
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')
-rw-r--r-- | kernel/kexec.c | 9 |
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, | |||
1422 | "crashkernel="); | 1422 | "crashkernel="); |
1423 | } | 1423 | } |
1424 | 1424 | ||
1425 | int __init parse_crashkernel_high(char *cmdline, | ||
1426 | unsigned long long system_ram, | ||
1427 | unsigned long long *crash_size, | ||
1428 | unsigned long long *crash_base) | ||
1429 | { | ||
1430 | return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base, | ||
1431 | "crashkernel_high="); | ||
1432 | } | ||
1433 | |||
1425 | int __init parse_crashkernel_low(char *cmdline, | 1434 | int __init parse_crashkernel_low(char *cmdline, |
1426 | unsigned long long system_ram, | 1435 | unsigned long long system_ram, |
1427 | unsigned long long *crash_size, | 1436 | unsigned long long *crash_size, |