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

Commit 21a4179c authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm64: KVM: Move __cpu_init_stage2 after kvm_call_hyp 



In order to ease the merge with the rest of the arm64 tree, move the
definition of __cpu_init_stage2() after what will be the new kvm_call_hyp.
Hopefully the resolution of the merge conflict will be obvious.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 68130cb5

arch/arm64/include/asm/kvm_host.h

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

}



static inline void __cpu_init_stage2(void)

{

	kvm_call_hyp(__init_stage2_translation);

}



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) {}
@@ -349,4 +344,11 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu); 
void kvm_arm_clear_debug(struct kvm_vcpu *vcpu);

void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu);



/* #define kvm_call_hyp(f, ...) __kvm_call_hyp(kvm_ksym_ref(f), ##__VA_ARGS__) */



static inline void __cpu_init_stage2(void)

{

	kvm_call_hyp(__init_stage2_translation);

}



#endif /* __ARM64_KVM_HOST_H__ */