From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2997592AbdDZKQ5 (ORCPT ); Wed, 26 Apr 2017 06:16:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47500 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2997486AbdDZKQj (ORCPT ); Wed, 26 Apr 2017 06:16:39 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 444BF80515 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=bhe@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 444BF80515 From: Baoquan He To: mingo@kernel.org, linux-kernel@vger.kernel.org Cc: keescook@chromium.org, dyoung@redhat.com, douly.fnst@cn.fujitsu.com, dan.j.williams@intel.com, Baoquan He , Jonathan Corbet , "Rafael J. Wysocki" , Andrew Morton , Greg Kroah-Hartman , Bjorn Helgaas , Mauro Carvalho Chehab , linux-doc@vger.kernel.org Subject: [PATCH v3 3/3] Documentation/kernel-parameters.txt: Update 'memmap=' option description Date: Wed, 26 Apr 2017 18:16:12 +0800 Message-Id: <1493201772-19084-4-git-send-email-bhe@redhat.com> In-Reply-To: <1493201772-19084-1-git-send-email-bhe@redhat.com> References: <1493201772-19084-1-git-send-email-bhe@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 26 Apr 2017 10:16:33 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In commit: 9710f581bb4c ("x86, mm: Let "memmap=" take more entries one time") ... 'memmap=' was changed to adopt multiple, comma delimited values in a single entry, so update the related description. In the special case of only specifying size value without an offset, like memmap=nn[KMG], memmap behaves similarly to mem=nn[KMG], so update it too here. Furthermore, for memmap=nn[KMG]$ss[KMG], an escape character needs be added before '$' for some bootloaders. E.g in grub2, if we specify memmap=100M$5G as suggested by the documentation, "memmap=100MG" gets passed to the kernel. Clarify all this. Signed-off-by: Baoquan He Cc: Jonathan Corbet Cc: "Rafael J. Wysocki" Cc: Andrew Morton Cc: Greg Kroah-Hartman Cc: Bjorn Helgaas Cc: Mauro Carvalho Chehab Cc: linux-doc@vger.kernel.org --- Documentation/admin-guide/kernel-parameters.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 986e443..d518144 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2097,6 +2097,12 @@ memmap=nn[KMG]@ss[KMG] [KNL] Force usage of a specific region of memory. Region of memory to be used is from ss to ss+nn. + If @ss[KMG] is omitted, it equals to mem=nn[KMG] + which limits max address as nn[KMG]. + Multiple different options can be put into one entry + with comma delimited to save space: + Example: + memmap=100M@2G,100M#3G,1G!1024G memmap=nn[KMG]#ss[KMG] [KNL,ACPI] Mark specific memory as ACPI data. @@ -2109,6 +2115,9 @@ memmap=64K$0x18690000 or memmap=0x10000$0x18690000 + Some bootloaders may need escape character before '$', + like in grub2, otherwise '$' and the following number + will be eaten. memmap=nn[KMG]!ss[KMG] [KNL,X86] Mark specific memory as protected. -- 2.5.5