1 files changed, 5 insertions, 15 deletions

diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index 4e14dac282bb..9c747cb14ad8 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -112,7 +112,6 @@ struct vgic_vmcr {
 struct vgic_ops {
         struct vgic_lr  (*get_lr)(const struct kvm_vcpu *, int);
         void    (*set_lr)(struct kvm_vcpu *, int, struct vgic_lr);
-        void    (*sync_lr_elrsr)(struct kvm_vcpu *, int, struct vgic_lr);
         u64     (*get_elrsr)(const struct kvm_vcpu *vcpu);
         u64     (*get_eisr)(const struct kvm_vcpu *vcpu);
         void    (*clear_eisr)(struct kvm_vcpu *vcpu);
@@ -159,7 +158,6 @@ struct irq_phys_map {
         u32                     virt_irq;
         u32                     phys_irq;
         u32                     irq;
-        bool                    active;
 };
 
 struct irq_phys_map_entry {
@@ -282,7 +280,7 @@ struct vgic_v2_cpu_if {
 };
 
 struct vgic_v3_cpu_if {
-#ifdef CONFIG_ARM_GIC_V3
+#ifdef CONFIG_KVM_ARM_VGIC_V3
         u32             vgic_hcr;
         u32             vgic_vmcr;
         u32             vgic_sre;       /* Restored only, change ignored */
@@ -296,22 +294,16 @@ struct vgic_v3_cpu_if {
 };
 
 struct vgic_cpu {
-        /* per IRQ to LR mapping */
-        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;
         unsigned long   *active_shared;
         unsigned long   *pend_act_shared;
 
-        /* Bitmap of used/free list registers */
-        DECLARE_BITMAP( lr_used, VGIC_V2_MAX_LRS);
-
         /* Number of list registers on this CPU */
         int             nr_lr;
 
@@ -354,8 +346,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))
@@ -364,7 +354,7 @@ void kvm_vgic_set_phys_irq_active(struct irq_phys_map *map, bool active);
 int vgic_v2_probe(struct device_node *vgic_node,
                   const struct vgic_ops **ops,
                   const struct vgic_params **params);
-#ifdef CONFIG_ARM_GIC_V3
+#ifdef CONFIG_KVM_ARM_VGIC_V3
 int vgic_v3_probe(struct device_node *vgic_node,
                   const struct vgic_ops **ops,
                   const struct vgic_params **params);