summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2018-09-18 15:12:51 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2018-09-18 15:12:51 +0200
commitcb5fb87a2fbee188fac605e0ebff8c35efdbaf3d (patch)
tree0338553bd44f4407060499f819cbe7d9c31808bf /Documentation
parent7876320f88802b22d4e2daf7eb027dd14175a0f8 (diff)
parent40ebdb8e59df36e2cc71810bd021a0808b16c956 (diff)
downloadlinux-cb5fb87a2fbee188fac605e0ebff8c35efdbaf3d.tar.bz2
Merge tag 'kvm-s390-master-4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Fixes for 4.19 - more fallout from the hugetlbfs enablement - bugfix for vma handling
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/virtual/kvm/api.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index c664064f76fb..8d8a372c8340 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -4510,7 +4510,8 @@ Do not enable KVM_FEATURE_PV_UNHALT if you disable HLT exits.
Architectures: s390
Parameters: none
Returns: 0 on success, -EINVAL if hpage module parameter was not set
- or cmma is enabled
+ or cmma is enabled, or the VM has the KVM_VM_S390_UCONTROL
+ flag set
With this capability the KVM support for memory backing with 1m pages
through hugetlbfs can be enabled for a VM. After the capability is