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

Commit 22b39ca3 authored by Marc Zyngier's avatar Marc Zyngier Committed by Catalin Marinas
Browse files

arm64: KVM: Move kvm_call_hyp back to its original localtion 



In order to reduce the risk of a bad merge, let's move the new
kvm_call_hyp back to its original location in the file. This has
zero impact from a code point of view.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 020d044f

arch/arm64/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -308,6 +308,8 @@ struct kvm_vcpu *kvm_arm_get_running_vcpu(void); 
struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void);



u64 __kvm_call_hyp(void *hypfn, ...);

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



void force_vm_exit(const cpumask_t *mask);

void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot);
@@ -343,6 +345,4 @@ 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__)



#endif /* __ARM64_KVM_HOST_H__ */