aboutsummaryrefslogtreecommitdiff
path: root/linux-headers/asm-arm
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2015-03-31 16:07:08 +0200
committerCornelia Huck <cornelia.huck@de.ibm.com>2015-04-30 13:21:42 +0200
commit7a52ce8a160739c5d37469b0e344d3239eb86462 (patch)
treebf70bb20b121451841393c212736861557692f23 /linux-headers/asm-arm
parent217a4acb211d603f33199cf94ada9fce3ac419b5 (diff)
downloadqemu-7a52ce8a160739c5d37469b0e344d3239eb86462.zip
qemu-7a52ce8a160739c5d37469b0e344d3239eb86462.tar.gz
qemu-7a52ce8a160739c5d37469b0e344d3239eb86462.tar.bz2
linux-headers: update
This updates linux-headers against master 4.1-rc1 (commit b787f68c36d49bb1d9236f403813641efa74a031). Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'linux-headers/asm-arm')
-rw-r--r--linux-headers/asm-arm/kvm.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h
index 0db25bc..c98e4dc 100644
--- a/linux-headers/asm-arm/kvm.h
+++ b/linux-headers/asm-arm/kvm.h
@@ -195,9 +195,16 @@ 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.
+ */
#define KVM_ARM_IRQ_GIC_MAX 127
+/* One single KVM irqchip, ie. the VGIC */
+#define KVM_NR_IRQCHIPS 1
+
/* PSCI interface */
#define KVM_PSCI_FN_BASE 0x95c1ba5e
#define KVM_PSCI_FN(n) (KVM_PSCI_FN_BASE + (n))