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

Commit 46c4a30b authored by Mark Rutland's avatar Mark Rutland Committed by Marc Zyngier
Browse files

arm64: KVM: Use lm_alias() for kvm_ksym_ref() 



For historical reasons, we open-code lm_alias() in kvm_ksym_ref().

Let's use lm_alias() to avoid duplication and make things clearer.

As we have to pull this from <linux/mm.h> (which is not safe for
inclusion in assembly), we may as well move the kvm_ksym_ref()
definition into the existing !__ASSEMBLY__ block.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Christoffer Dall <christoffer.dall@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: kvmarm@lists.cs.columbia.edu
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 75bc37fe

arch/arm64/include/asm/kvm_asm.h

+5 −2
Original line number Original line Diff line number Diff line
@@ -33,16 +33,19 @@ 
#define KVM_ARM64_DEBUG_DIRTY_SHIFT	0

#define KVM_ARM64_DEBUG_DIRTY_SHIFT	0

#define KVM_ARM64_DEBUG_DIRTY		(1 << KVM_ARM64_DEBUG_DIRTY_SHIFT)

#define KVM_ARM64_DEBUG_DIRTY		(1 << KVM_ARM64_DEBUG_DIRTY_SHIFT)





#ifndef __ASSEMBLY__



#include <linux/mm.h>



/* Translate a kernel address of @sym into its equivalent linear mapping */

/* Translate a kernel address of @sym into its equivalent linear mapping */

#define kvm_ksym_ref(sym)						\

#define kvm_ksym_ref(sym)						\

	({								\

	({								\

		void *val = &sym;					\

		void *val = &sym;					\

		if (!is_kernel_in_hyp_mode())				\

		if (!is_kernel_in_hyp_mode())				\

			val = phys_to_virt((u64)&sym - kimage_voffset);	\

			val = lm_alias(&sym);				\

		val;							\

		val;							\

	 })

	 })





#ifndef __ASSEMBLY__

struct kvm;

struct kvm;

struct kvm_vcpu;

struct kvm_vcpu;