diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-04-27 17:33:14 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-04-27 17:33:14 +0200 |
| commit | c24a7be2110ddac2ab75abcded76c62dccb6b1f0 (patch) | |
| tree | cb4ef87091258db6b0f94cf2d4bd938eae1e26de /arch/arm/include/uapi | |
| parent | 70f3aac964ae2bc9a0a1d5d65a62e258591ade18 (diff) | |
| parent | 1edb632133efb6226b6bef3e7d9fa8c7134ac4e2 (diff) | |
| download | blackbird-op-linux-c24a7be2110ddac2ab75abcded76c62dccb6b1f0.tar.gz blackbird-op-linux-c24a7be2110ddac2ab75abcded76c62dccb6b1f0.zip | |
Merge tag 'kvm-arm-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM Changes for v4.12.
Changes include:
- Using the common sysreg definitions between KVM and arm64
- Improved hyp-stub implementation with support for kexec and kdump on the 32-bit side
- Proper PMU exception handling
- Performance improvements of our GIC handling
- Support for irqchip in userspace with in-kernel arch-timers and PMU support
- A fix for a race condition in our PSCI code
Conflicts:
Documentation/virtual/kvm/api.txt
include/uapi/linux/kvm.h
Diffstat (limited to 'arch/arm/include/uapi')
| -rw-r--r-- | arch/arm/include/uapi/asm/kvm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/uapi/asm/kvm.h b/arch/arm/include/uapi/asm/kvm.h index 254a38cace2a..a88726359e5f 100644 --- a/arch/arm/include/uapi/asm/kvm.h +++ b/arch/arm/include/uapi/asm/kvm.h @@ -116,6 +116,8 @@ struct kvm_debug_exit_arch { }; struct kvm_sync_regs { + /* Used with KVM_CAP_ARM_USER_IRQ */ + __u64 device_irq_level; }; struct kvm_arch_memory_slot { |
