Commit d7ca1079 authored by Andrew Scull's avatar Andrew Scull Committed by Marc Zyngier
Browse files

KVM: arm64: Remove kvm_host_data_t typedef 



The kvm_host_data_t typedef is used inconsistently and goes against the
kernel's coding style. Remove it in favour of the full struct specifier.

Signed-off-by: default avatarAndrew Scull <ascull@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200915104643.2543892-4-ascull@google.com
parent 6a0259ed

arch/arm64/include/asm/kvm_host.h

+1 −3
Original line number Diff line number Diff line
@@ -262,8 +262,6 @@ struct kvm_host_data { 
	struct kvm_pmu_events pmu_events;

};



typedef struct kvm_host_data kvm_host_data_t;



struct vcpu_reset_state {

	unsigned long	pc;

	unsigned long	r0;
@@ -565,7 +563,7 @@ void kvm_set_sei_esr(struct kvm_vcpu *vcpu, u64 syndrome); 


struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr);



DECLARE_PER_CPU(kvm_host_data_t, kvm_host_data);

DECLARE_PER_CPU(struct kvm_host_data, kvm_host_data);



static inline void kvm_init_host_cpu_context(struct kvm_cpu_context *cpu_ctxt)

{

arch/arm64/kvm/arm.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
__asm__(".arch_extension	virt");

#endif



DEFINE_PER_CPU(kvm_host_data_t, kvm_host_data);

DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data);

static DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page);



/* The VMID used in the VTTBR */
@@ -1538,7 +1538,7 @@ static int init_hyp_mode(void) 
	}



	for_each_possible_cpu(cpu) {

		kvm_host_data_t *cpu_data;

		struct kvm_host_data *cpu_data;



		cpu_data = per_cpu_ptr(&kvm_host_data, cpu);

		err = create_hyp_mappings(cpu_data, cpu_data + 1, PAGE_HYP);