aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2013-04-16 01:23:48 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2013-04-17 15:35:33 -0400
commitadbc742bf78695bb98c79d18c558b61571748b99 (patch)
treedc23f5049248f7aa9ddf5ee62434dba81d707531 /arch/x86
parent55a20ee7804ab64ac90bcdd4e2868a42829e2784 (diff)
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of crashkernel_hign=X crashkernel_low=Y. As that could be extensible. -v2: according to Vivek, change delimiter to ; -v3: let hign and low only handle simple form and it conforms to description in kernel-parameters.txt still keep crashkernel=X override any crashkernel=X,high crashkernel=Y,low -v4: update get_last_crashkernel returning and add more strict checking in parse_crashkernel_simple() found by HATAYAMA. -v5: Change delimiter back to , according to HPA. also separate parse_suffix from parse_simper according to vivek. so we can avoid @pos in that path. -v6: Tight the checking about crashkernel=X,highblahblah,high found by HTYAYAMA. Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Link: http://lkml.kernel.org/r/1366089828-19692-5-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 'arch/x86')
-rw-r--r--arch/x86/kernel/setup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index a85a144f2052..fae9134a2de9 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -528,7 +528,7 @@ static void __init reserve_crashkernel_low(void)
528 int ret; 528 int ret;
529 529
530 total_low_mem = memblock_mem_size(1UL<<(32-PAGE_SHIFT)); 530 total_low_mem = memblock_mem_size(1UL<<(32-PAGE_SHIFT));
531 /* crashkernel_low=YM */ 531 /* crashkernel=Y,low */
532 ret = parse_crashkernel_low(boot_command_line, total_low_mem, 532 ret = parse_crashkernel_low(boot_command_line, total_low_mem,
533 &low_size, &base); 533 &low_size, &base);
534 if (ret != 0) { 534 if (ret != 0) {
@@ -542,7 +542,7 @@ static void __init reserve_crashkernel_low(void)
542 low_size = swiotlb_size_or_default() + (8UL<<20); 542 low_size = swiotlb_size_or_default() + (8UL<<20);
543 auto_set = true; 543 auto_set = true;
544 } else { 544 } else {
545 /* passed with crashkernel_low=0 ? */ 545 /* passed with crashkernel=0,low ? */
546 if (!low_size) 546 if (!low_size)
547 return; 547 return;
548 } 548 }
@@ -582,7 +582,7 @@ static void __init reserve_crashkernel(void)
582 ret = parse_crashkernel(boot_command_line, total_mem, 582 ret = parse_crashkernel(boot_command_line, total_mem,
583 &crash_size, &crash_base); 583 &crash_size, &crash_base);
584 if (ret != 0 || crash_size <= 0) { 584 if (ret != 0 || crash_size <= 0) {
585 /* crashkernel_high=XM */ 585 /* crashkernel=X,high */
586 ret = parse_crashkernel_high(boot_command_line, total_mem, 586 ret = parse_crashkernel_high(boot_command_line, total_mem,
587 &crash_size, &crash_base); 587 &crash_size, &crash_base);
588 if (ret != 0 || crash_size <= 0) 588 if (ret != 0 || crash_size <= 0)