diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2016-12-12 07:29:39 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-12-12 07:29:39 +0100 |
commit | f673b5b2a66332da5358def524dbfb3305c76d8c (patch) | |
tree | 9f55a133030bb236b7ecc48f776fefc688d243c3 /Documentation/virtual | |
parent | KVM: x86: Handle the kthread worker using the new API (diff) | |
parent | arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest (diff) | |
download | linux-f673b5b2a66332da5358def524dbfb3305c76d8c.tar.xz linux-f673b5b2a66332da5358def524dbfb3305c76d8c.zip |
Merge tag 'kvm-arm-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM updates for 4.10:
- Support for the GICv3 ITS on 32bit platforms
- A handful of timer and GIC emulation fixes
- A PMU architecture fix
Diffstat (limited to 'Documentation/virtual')
-rw-r--r-- | Documentation/virtual/kvm/api.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index 8a5ebd118313..72a718c1176d 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt @@ -2201,7 +2201,7 @@ after pausing the vcpu, but before it is resumed. 4.71 KVM_SIGNAL_MSI Capability: KVM_CAP_SIGNAL_MSI -Architectures: x86 arm64 +Architectures: x86 arm arm64 Type: vm ioctl Parameters: struct kvm_msi (in) Returns: >0 on delivery, 0 if guest blocked the MSI, and -1 on error |