diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-11-07 15:39:44 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-11-07 15:39:44 +0100 |
| commit | 173ede4ddd054e072f9178d655a660c8aaa80cea (patch) | |
| tree | cb2b2ed48c2e91a03bcc67e2ce0018a0afc27dc0 /Documentation | |
| parent | c6338ce494456ed9c92ef10f63c0a8408bfeac6d (diff) | |
| parent | 365dc1633521a32d55d839f56b41bb9a531d957a (diff) | |
| download | op-kernel-dev-173ede4ddd054e072f9178d655a660c8aaa80cea.zip op-kernel-dev-173ede4ddd054e072f9178d655a660c8aaa80cea.tar.gz | |
Merge tag 'kvm-s390-next-20141107' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Fixes for kvm/next (3.19) and stable
1. We should flush TLBs for load control instruction emulation (stable)
2. A workaround for a compiler bug that renders ACCESS_ONCE broken (stable)
3. Fix program check handling for load control
4. Documentation Fix
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/virtual/kvm/devices/vm.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/virtual/kvm/devices/vm.txt b/Documentation/virtual/kvm/devices/vm.txt index 0d16f96..d426fc8 100644 --- a/Documentation/virtual/kvm/devices/vm.txt +++ b/Documentation/virtual/kvm/devices/vm.txt @@ -12,14 +12,14 @@ specific. 1. GROUP: KVM_S390_VM_MEM_CTRL Architectures: s390 -1.1. ATTRIBUTE: KVM_S390_VM_MEM_CTRL +1.1. ATTRIBUTE: KVM_S390_VM_MEM_ENABLE_CMMA Parameters: none -Returns: -EBUSY if already a vcpus is defined, otherwise 0 +Returns: -EBUSY if a vcpu is already defined, otherwise 0 -Enables CMMA for the virtual machine +Enables Collaborative Memory Management Assist (CMMA) for the virtual machine. -1.2. ATTRIBUTE: KVM_S390_VM_CLR_CMMA -Parameteres: none +1.2. ATTRIBUTE: KVM_S390_VM_MEM_CLR_CMMA +Parameters: none Returns: 0 Clear the CMMA status for all guest pages, so any pages the guest marked |
