diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2014-07-08 07:09:03 -0400 |
---|---|---|
committer | Christoffer Dall <christoffer.dall@linaro.org> | 2014-09-18 21:48:57 -0400 |
commit | fc675e355e705a046df7b635d3f3330c0ad94569 (patch) | |
tree | 2d254dde2cbb1b2810201c745332330366b382ff /include/kvm | |
parent | fb65ab63b8cae510ea1e43e68b5da2f9980aa6d5 (diff) |
arm/arm64: KVM: vgic: kill VGIC_MAX_CPUS
We now have the information about the number of CPU interfaces in
the distributor itself. Let's get rid of VGIC_MAX_CPUS, and just
rely on KVM_MAX_VCPUS where we don't have the choice. Yet.
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index b2f9936df319..3b73d7845124 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h | |||
@@ -29,13 +29,12 @@ | |||
29 | #define VGIC_NR_SGIS 16 | 29 | #define VGIC_NR_SGIS 16 |
30 | #define VGIC_NR_PPIS 16 | 30 | #define VGIC_NR_PPIS 16 |
31 | #define VGIC_NR_PRIVATE_IRQS (VGIC_NR_SGIS + VGIC_NR_PPIS) | 31 | #define VGIC_NR_PRIVATE_IRQS (VGIC_NR_SGIS + VGIC_NR_PPIS) |
32 | #define VGIC_MAX_CPUS KVM_MAX_VCPUS | ||
33 | 32 | ||
34 | #define VGIC_V2_MAX_LRS (1 << 6) | 33 | #define VGIC_V2_MAX_LRS (1 << 6) |
35 | #define VGIC_V3_MAX_LRS 16 | 34 | #define VGIC_V3_MAX_LRS 16 |
36 | 35 | ||
37 | /* Sanity checks... */ | 36 | /* Sanity checks... */ |
38 | #if (VGIC_MAX_CPUS > 8) | 37 | #if (KVM_MAX_VCPUS > 8) |
39 | #error Invalid number of CPU interfaces | 38 | #error Invalid number of CPU interfaces |
40 | #endif | 39 | #endif |
41 | 40 | ||