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

Commit ff3a01d1 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

ARM: KVM: Cleanup asm-offsets.c 



Since we don't have much assembler left, most of the KVM stuff
in asm-offsets.c is now superfluous. Let's get rid of it.

Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 4448932f

arch/arm/kernel/asm-offsets.c

+0 −30
Original line number Diff line number Diff line
@@ -170,42 +170,12 @@ int main(void) 
  DEFINE(CACHE_WRITEBACK_GRANULE, __CACHE_WRITEBACK_GRANULE);

  BLANK();

#ifdef CONFIG_KVM_ARM_HOST

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

  DEFINE(VCPU_MIDR,		offsetof(struct kvm_vcpu, arch.midr));

  DEFINE(VCPU_GUEST_CTXT,	offsetof(struct kvm_vcpu, arch.ctxt));

  DEFINE(VCPU_HOST_CTXT,	offsetof(struct kvm_vcpu, arch.host_cpu_context));

  DEFINE(CPU_CTXT_VFP,		offsetof(struct kvm_cpu_context, vfp));

  DEFINE(CPU_CTXT_CP15,		offsetof(struct kvm_cpu_context, cp15));

  DEFINE(CPU_CTXT_GP_REGS,	offsetof(struct kvm_cpu_context, gp_regs));

  DEFINE(GP_REGS_USR,		offsetof(struct kvm_regs, usr_regs));

  DEFINE(GP_REGS_SVC,		offsetof(struct kvm_regs, svc_regs));

  DEFINE(GP_REGS_ABT,		offsetof(struct kvm_regs, abt_regs));

  DEFINE(GP_REGS_UND,		offsetof(struct kvm_regs, und_regs));

  DEFINE(GP_REGS_IRQ,		offsetof(struct kvm_regs, irq_regs));

  DEFINE(GP_REGS_FIQ,		offsetof(struct kvm_regs, fiq_regs));

  DEFINE(GP_REGS_PC,		offsetof(struct kvm_regs, usr_regs.ARM_pc));

  DEFINE(GP_REGS_CPSR,		offsetof(struct kvm_regs, usr_regs.ARM_cpsr));

  DEFINE(VCPU_HCR,		offsetof(struct kvm_vcpu, arch.hcr));

  DEFINE(VCPU_IRQ_LINES,	offsetof(struct kvm_vcpu, arch.irq_lines));

  DEFINE(VCPU_HSR,		offsetof(struct kvm_vcpu, arch.fault.hsr));

  DEFINE(VCPU_HxFAR,		offsetof(struct kvm_vcpu, arch.fault.hxfar));

  DEFINE(VCPU_HPFAR,		offsetof(struct kvm_vcpu, arch.fault.hpfar));

  DEFINE(VCPU_HYP_PC,		offsetof(struct kvm_vcpu, arch.fault.hyp_pc));

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

  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));

  DEFINE(VGIC_V2_CPU_EISR,	offsetof(struct vgic_cpu, vgic_v2.vgic_eisr));

  DEFINE(VGIC_V2_CPU_ELRSR,	offsetof(struct vgic_cpu, vgic_v2.vgic_elrsr));

  DEFINE(VGIC_V2_CPU_APR,	offsetof(struct vgic_cpu, vgic_v2.vgic_apr));

  DEFINE(VGIC_V2_CPU_LR,	offsetof(struct vgic_cpu, vgic_v2.vgic_lr));

  DEFINE(VGIC_CPU_NR_LR,	offsetof(struct vgic_cpu, nr_lr));

  DEFINE(VCPU_TIMER_CNTV_CTL,	offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_ctl));

  DEFINE(VCPU_TIMER_CNTV_CVAL,	offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_cval));

  DEFINE(KVM_TIMER_CNTVOFF,	offsetof(struct kvm, arch.timer.cntvoff));

  DEFINE(KVM_TIMER_ENABLED,	offsetof(struct kvm, arch.timer.enabled));

  DEFINE(KVM_VGIC_VCTRL,	offsetof(struct kvm, arch.vgic.vctrl_base));

  DEFINE(KVM_VTTBR,		offsetof(struct kvm, arch.vttbr));

#endif

  BLANK();

#ifdef CONFIG_VDSO