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

Commit 8cebe750 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

arm64: KVM: Make kvm_skip_instr32 available to HYP 



As we plan to do some emulation at HYP, let's make kvm_skip_instr32
as part of the hyp_text section. This doesn't preclude the kernel
from using it.

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

virt/kvm/arm/aarch32.c

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include <linux/kvm_host.h>

#include <asm/kvm_emulate.h>

#include <asm/kvm_hyp.h>



#ifndef CONFIG_ARM64

#define COMPAT_PSR_T_BIT	PSR_T_BIT
@@ -108,7 +109,7 @@ bool kvm_condition_valid32(const struct kvm_vcpu *vcpu) 
 *

 * IT[7:0] -> CPSR[26:25],CPSR[15:10]

 */

static void kvm_adjust_itstate(struct kvm_vcpu *vcpu)

static void __hyp_text kvm_adjust_itstate(struct kvm_vcpu *vcpu)

{

	unsigned long itbits, cond;

	unsigned long cpsr = *vcpu_cpsr(vcpu);
@@ -138,7 +139,7 @@ static void kvm_adjust_itstate(struct kvm_vcpu *vcpu) 
 * kvm_skip_instr - skip a trapped instruction and proceed to the next

 * @vcpu: The vcpu pointer

 */

void kvm_skip_instr32(struct kvm_vcpu *vcpu, bool is_wide_instr)

void __hyp_text kvm_skip_instr32(struct kvm_vcpu *vcpu, bool is_wide_instr)

{

	bool is_thumb;