KVM: arm: Do not indent the arguments of DECLARE_BITMAP

[deliverable/linux.git] / include / kvm / arm_vgic.h

diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index d901f1a47be6c5e4af71ea7543f7dc7163eca2f9..8065801a1847ef60b1bef646a5940d0cc524a257 100644 (file)
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -35,11 +35,7 @@
 #define VGIC_V3_MAX_LRS                16
 #define VGIC_MAX_IRQS          1024
 #define VGIC_V2_MAX_CPUS       8
-
-/* Sanity checks... */
-#if (KVM_MAX_VCPUS > 255)
-#error Too many KVM VCPUs, the VGIC only supports up to 255 VCPUs for now
-#endif
+#define VGIC_V3_MAX_CPUS       255
 
 #if (VGIC_NR_IRQS_LEGACY & 31)
 #error "VGIC_NR_IRQS must be a multiple of 32"
@@ -163,7 +159,6 @@ struct irq_phys_map {
        u32                     virt_irq;
        u32                     phys_irq;
        u32                     irq;
-       bool                    active;
 };
 
 struct irq_phys_map_entry {
@@ -304,9 +299,9 @@ struct vgic_cpu {
        u8              *vgic_irq_lr_map;
 
        /* Pending/active/both interrupts on this VCPU */
-       DECLARE_BITMAP( pending_percpu, VGIC_NR_PRIVATE_IRQS);
-       DECLARE_BITMAP( active_percpu, VGIC_NR_PRIVATE_IRQS);
-       DECLARE_BITMAP( pend_act_percpu, VGIC_NR_PRIVATE_IRQS);
+       DECLARE_BITMAP(pending_percpu, VGIC_NR_PRIVATE_IRQS);
+       DECLARE_BITMAP(active_percpu, VGIC_NR_PRIVATE_IRQS);
+       DECLARE_BITMAP(pend_act_percpu, VGIC_NR_PRIVATE_IRQS);
 
        /* Pending/active/both shared interrupts, dynamically sized */
        unsigned long   *pending_shared;
@@ -314,7 +309,7 @@ struct vgic_cpu {
        unsigned long   *pend_act_shared;
 
        /* Bitmap of used/free list registers */
-       DECLARE_BITMAP( lr_used, VGIC_V2_MAX_LRS);
+       DECLARE_BITMAP(lr_used, VGIC_V2_MAX_LRS);
 
        /* Number of list registers on this CPU */
        int             nr_lr;
@@ -358,8 +353,6 @@ int kvm_vgic_vcpu_active_irq(struct kvm_vcpu *vcpu);
 struct irq_phys_map *kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu,
                                           int virt_irq, int irq);
 int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, struct irq_phys_map *map);
-bool kvm_vgic_get_phys_irq_active(struct irq_phys_map *map);
-void kvm_vgic_set_phys_irq_active(struct irq_phys_map *map, bool active);
 
 #define irqchip_in_kernel(k)   (!!((k)->arch.vgic.in_kernel))
 #define vgic_initialized(k)    (!!((k)->arch.vgic.nr_cpus))