History

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

Paolo Bonzini committed 9 years ago

Commit c24a7be2 parents 70f3aac 1edb63250 files · +1174 −938Browse files

Showing the changes to include/uapi/linux (1 of 50 files). Show all

Unified · Split

include/uapi/linux/kvm.h+8−0
@@ -894,6 +894,7 @@ struct kvm_ppc_resize_hpt { · 893 unmodified lines
894#define KVM_CAP_S390_AIS 141894#define KVM_CAP_S390_AIS 141
895#define KVM_CAP_SPAPR_TCE_VFIO 142895#define KVM_CAP_SPAPR_TCE_VFIO 142
896#define KVM_CAP_X86_GUEST_MWAIT 143896#define KVM_CAP_X86_GUEST_MWAIT 143
897#define KVM_CAP_ARM_USER_IRQ 144
897 898
898#ifdef KVM_CAP_IRQ_ROUTING899#ifdef KVM_CAP_IRQ_ROUTING
899 900
@@ -1371,4 +1372,11 @@ struct kvm_assigned_msix_entry { · 471 unmodified lines
1371#define KVM_X2APIC_API_USE_32BIT_IDS (1ULL << 0)1372#define KVM_X2APIC_API_USE_32BIT_IDS (1ULL << 0)
1372#define KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK (1ULL << 1)1373#define KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK (1ULL << 1)
1373 1374
1375/* Available with KVM_CAP_ARM_USER_IRQ */
1376
1377/* Bits for run->s.regs.device_irq_level */
1378#define KVM_ARM_DEV_EL1_VTIMER (1 << 0)
1379#define KVM_ARM_DEV_EL1_PTIMER (1 << 1)
1380#define KVM_ARM_DEV_PMU (1 << 2)
1381
1374#endif /* __LINUX_KVM_H */1382#endif /* __LINUX_KVM_H */