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

Commit 4d13c3b0 authored by Jes Sorensen's avatar Jes Sorensen Committed by Avi Kivity
Browse files

KVM: ia64: preserve int status through call to kvm_insert_vmm_mapping 



Preserve interrupt status around call to kvm_insert_vmm_mappin()
in kvm_vcpu_pre_transition().

Signed-off-by: default avatarJes Sorensen <jes@sgi.com>
Acked-by: default avatarXiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 457459c3

arch/ia64/kvm/kvm-ia64.c

+6 −1
Original line number Diff line number Diff line
@@ -619,6 +619,8 @@ static void kvm_purge_vmm_mapping(struct kvm_vcpu *vcpu) 


static int kvm_vcpu_pre_transition(struct kvm_vcpu *vcpu)

{

	unsigned long psr;

	int r;

	int cpu = smp_processor_id();



	if (vcpu->arch.last_run_cpu != cpu ||
@@ -630,7 +632,10 @@ static int kvm_vcpu_pre_transition(struct kvm_vcpu *vcpu) 


	vcpu->arch.host_rr6 = ia64_get_rr(RR6);

	vti_set_rr6(vcpu->arch.vmm_rr);

	return kvm_insert_vmm_mapping(vcpu);

	local_irq_save(psr);

	r = kvm_insert_vmm_mapping(vcpu);

	local_irq_restore(psr);

	return r;

}



static void kvm_vcpu_post_transition(struct kvm_vcpu *vcpu)