Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48f8bd57 authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Marc Zyngier
Browse files

arm64: KVM: remove remaining reference to vgic_sr_vectors 



Since commit 8a14849b (arm64: KVM: Switch vgic save/restore to
alternative_insn) vgic_sr_vectors is not used anymore, so remove
remaining leftovers and kill the structure.

Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent bca556ac

arch/arm64/include/asm/kvm_host.h

+0 −5
Original line number Diff line number Diff line
@@ -246,11 +246,6 @@ static inline void __cpu_init_hyp_mode(phys_addr_t boot_pgd_ptr, 
		     hyp_stack_ptr, vector_ptr);

}



struct vgic_sr_vectors {

	void	*save_vgic;

	void	*restore_vgic;

};



static inline void kvm_arch_hardware_disable(void) {}

static inline void kvm_arch_hardware_unsetup(void) {}

static inline void kvm_arch_sync_events(struct kvm *kvm) {}

arch/arm64/kernel/asm-offsets.c

+0 −2
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ int main(void) 
  DEFINE(KVM_TIMER_ENABLED,	offsetof(struct kvm, arch.timer.enabled));

  DEFINE(VCPU_KVM,		offsetof(struct kvm_vcpu, kvm));

  DEFINE(VCPU_VGIC_CPU,		offsetof(struct kvm_vcpu, arch.vgic_cpu));

  DEFINE(VGIC_SAVE_FN,		offsetof(struct vgic_sr_vectors, save_vgic));

  DEFINE(VGIC_RESTORE_FN,	offsetof(struct vgic_sr_vectors, restore_vgic));

  DEFINE(VGIC_V2_CPU_HCR,	offsetof(struct vgic_cpu, vgic_v2.vgic_hcr));

  DEFINE(VGIC_V2_CPU_VMCR,	offsetof(struct vgic_cpu, vgic_v2.vgic_vmcr));

  DEFINE(VGIC_V2_CPU_MISR,	offsetof(struct vgic_cpu, vgic_v2.vgic_misr));