aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
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 /Documentation/kernel-parameters.txt
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 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 709eb3edc6b2..a1ac1f1d6d34 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -603,16 +603,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
603 a memory unit (amount[KMG]). See also 603 a memory unit (amount[KMG]). See also
604 Documentation/kdump/kdump.txt for an example. 604 Documentation/kdump/kdump.txt for an example.
605 605
606 crashkernel_high=size[KMG] 606 crashkernel=size[KMG],high
607 [KNL, x86_64] range could be above 4G. Allow kernel 607 [KNL, x86_64] range could be above 4G. Allow kernel
608 to allocate physical memory region from top, so could 608 to allocate physical memory region from top, so could
609 be above 4G if system have more than 4G ram installed. 609 be above 4G if system have more than 4G ram installed.
610 Otherwise memory region will be allocated below 4G, if 610 Otherwise memory region will be allocated below 4G, if
611 available. 611 available.
612 It will be ignored if crashkernel=X is specified. 612 It will be ignored if crashkernel=X is specified.
613 crashkernel_low=size[KMG] 613 crashkernel=size[KMG],low
614 [KNL, x86_64] range under 4G. When crashkernel_high= is 614 [KNL, x86_64] range under 4G. When crashkernel=X,high
615 passed, kernel could allocate physical memory region 615 is passed, kernel could allocate physical memory region
616 above 4G, that cause second kernel crash on system 616 above 4G, that cause second kernel crash on system
617 that require some amount of low memory, e.g. swiotlb 617 that require some amount of low memory, e.g. swiotlb
618 requires at least 64M+32K low memory. Kernel would 618 requires at least 64M+32K low memory. Kernel would
@@ -620,7 +620,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
620 This one let user to specify own low range under 4G 620 This one let user to specify own low range under 4G
621 for second kernel instead. 621 for second kernel instead.
622 0: to disable low allocation. 622 0: to disable low allocation.
623 It will be ignored when crashkernel_high=X is not used 623 It will be ignored when crashkernel=X,high is not used
624 or memory reserved is below 4G. 624 or memory reserved is below 4G.
625 625
626 cs89x0_dma= [HW,NET] 626 cs89x0_dma= [HW,NET]