diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-06-19 17:15:24 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-06-19 17:15:24 +0200 |
| commit | 05fe125fa3237de2ec5bada80031e694de78909c (patch) | |
| tree | 9e8cec45a5ded37b04c92a7a94dd1eefb5259344 /include/uapi | |
| parent | e80a4a9426adeaa34c009bc0bc61365e0580bf01 (diff) | |
| parent | c62e631d4a8e41493c6341d8259e996ed5fc11e3 (diff) | |
Merge tag 'kvm-arm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM changes for v4.2:
- Proper guest time accounting
- FP access fix for 32bit
- The usual pile of GIC fixes
- PSCI fixes
- Random cleanups
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/kvm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 5ff1038437e3..716ad4ae4d4b 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -897,7 +897,7 @@ struct kvm_xen_hvm_config { * * KVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies * the irqfd to operate in resampling mode for level triggered interrupt - * emlation. See Documentation/virtual/kvm/api.txt. + * emulation. See Documentation/virtual/kvm/api.txt. */ #define KVM_IRQFD_FLAG_RESAMPLE (1 << 1) |