diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2014-07-08 12:09:05 +0100 |
---|---|---|
committer | Christoffer Dall <christoffer.dall@linaro.org> | 2014-09-18 18:48:57 -0700 |
commit | 5fb66da64064d0cb8dcce4cc8bf4cb1b921b13a0 (patch) | |
tree | 2c7bccc3459029a9c55bd356fcdbe68369bf4acc /include/kvm | |
parent | c3c918361adcceb816c92b21dd95d2b46fb96a8f (diff) | |
download | linux-stable-5fb66da64064d0cb8dcce4cc8bf4cb1b921b13a0.tar.gz linux-stable-5fb66da64064d0cb8dcce4cc8bf4cb1b921b13a0.tar.bz2 linux-stable-5fb66da64064d0cb8dcce4cc8bf4cb1b921b13a0.zip |
arm/arm64: KVM: vgic: kill VGIC_NR_IRQS
Nuke VGIC_NR_IRQS entierly, now that the distributor instance
contains the number of IRQ allocated to this GIC.
Also add VGIC_NR_IRQS_LEGACY to preserve the current API.
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'include/kvm')
-rw-r--r-- | include/kvm/arm_vgic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index 2767f939f47c..aa20d4a7242f 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -25,7 +25,7 @@ #include <linux/spinlock.h> #include <linux/types.h> -#define VGIC_NR_IRQS 256 +#define VGIC_NR_IRQS_LEGACY 256 #define VGIC_NR_SGIS 16 #define VGIC_NR_PPIS 16 #define VGIC_NR_PRIVATE_IRQS (VGIC_NR_SGIS + VGIC_NR_PPIS) @@ -39,11 +39,11 @@ #error Invalid number of CPU interfaces #endif -#if (VGIC_NR_IRQS & 31) +#if (VGIC_NR_IRQS_LEGACY & 31) #error "VGIC_NR_IRQS must be a multiple of 32" #endif -#if (VGIC_NR_IRQS > VGIC_MAX_IRQS) +#if (VGIC_NR_IRQS_LEGACY > VGIC_MAX_IRQS) #error "VGIC_NR_IRQS must be <= 1024" #endif |