diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-04-22 17:08:12 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-04-22 17:08:12 +0200 |
| commit | 2fa462f826210bbec65f8ed06d5ef4e0cd4f5450 (patch) | |
| tree | ed21793f915d77bcfb8c8a5e6cd07412c735b5fd /arch/arm64 | |
| parent | 123857a705603a1d10d2adc02e9dcd065b0e1cb1 (diff) | |
| parent | fd1d0ddf2ae92fb3df42ed476939861806c5d785 (diff) | |
Merge tag 'kvm-arm-for-4.1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM changes for v4.1, take #2:
Rather small this time:
- a fix for a nasty bug with virtual IRQ injection
- a fix for irqfd
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/uapi/asm/kvm.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index c154c0b7eb60..d26832022127 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -188,8 +188,14 @@ struct kvm_arch_memory_slot { #define KVM_ARM_IRQ_CPU_IRQ 0 #define KVM_ARM_IRQ_CPU_FIQ 1 -/* Highest supported SPI, from VGIC_NR_IRQS */ +/* + * This used to hold the highest supported SPI, but it is now obsolete + * and only here to provide source code level compatibility with older + * userland. The highest SPI number can be set via KVM_DEV_ARM_VGIC_GRP_NR_IRQS. + */ +#ifndef __KERNEL__ #define KVM_ARM_IRQ_GIC_MAX 127 +#endif /* One single KVM irqchip, ie. the VGIC */ #define KVM_NR_IRQCHIPS 1 |