Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[mirror_ubuntu-bionic-kernel.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 591d48f3a7de3614a3175934bbe808e80b9902f5..6996b7727b85227a10f7404828756909afaee0fd 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4395,6 +4395,10 @@
                        decrease the size and leave more room for directly
                        mapped kernel RAM.
 
+       vmcp_cma=nn[MG] [KNL,S390]
+                       Sets the memory size reserved for contiguous memory
+                       allocations for the vmcp device driver.
+
        vmhalt=         [KNL,S390] Perform z/VM CP command after system halt.
                        Format: <command>