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

Commit 64cf98fa authored by Christoffer Dall's avatar Christoffer Dall Committed by Marc Zyngier
Browse files

KVM: arm/arm64: Move kvm_is_write_fault to header file 



Move this little function to the header files for arm/arm64 so other
code can make use of it directly.

Signed-off-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent bee038a6

arch/arm/include/asm/kvm_emulate.h

+8 −0
Original line number Diff line number Diff line
@@ -265,6 +265,14 @@ static inline bool kvm_vcpu_dabt_isextabt(struct kvm_vcpu *vcpu) 
	}

}



static inline bool kvm_is_write_fault(struct kvm_vcpu *vcpu)

{

	if (kvm_vcpu_trap_is_iabt(vcpu))

		return false;



	return kvm_vcpu_dabt_iswrite(vcpu);

}



static inline u32 kvm_vcpu_hvc_get_imm(struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_get_hsr(vcpu) & HSR_HVC_IMM_MASK;

arch/arm64/include/asm/kvm_emulate.h

+8 −0
Original line number Diff line number Diff line
@@ -331,6 +331,14 @@ static inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu) 
	return ESR_ELx_SYS64_ISS_RT(esr);

}



static inline bool kvm_is_write_fault(struct kvm_vcpu *vcpu)

{

	if (kvm_vcpu_trap_is_iabt(vcpu))

		return false;



	return kvm_vcpu_dabt_iswrite(vcpu);

}



static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)

{

	return vcpu_read_sys_reg(vcpu, MPIDR_EL1) & MPIDR_HWID_BITMASK;

virt/kvm/arm/mmu.c

+0 −8
Original line number Diff line number Diff line
@@ -1403,14 +1403,6 @@ static bool transparent_hugepage_adjust(kvm_pfn_t *pfnp, phys_addr_t *ipap) 
	return false;

}



static bool kvm_is_write_fault(struct kvm_vcpu *vcpu)

{

	if (kvm_vcpu_trap_is_iabt(vcpu))

		return false;



	return kvm_vcpu_dabt_iswrite(vcpu);

}



/**

 * stage2_wp_ptes - write protect PMD range

 * @pmd:	pointer to pmd entry