Commit 43890ae8 authored Apr 17, 2009 by Jes Sorensen Committed by Avi Kivity Jun 10, 2009

KVM: ia64: ia64 vcpu_reset() do not call kmalloc() with irqs disabled



Restore local irq enabled state before calling kvm_arch_vcpu_init(),
which calls kmalloc(GFP_KERNEL).

Signed-off-by: Jes Sorensen <jes@sgi.com>
Acked-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

parent 4d13c3b0

arch/ia64/kvm/kvm-ia64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2001,6 +2001,7 @@ static int vcpu_reset(struct kvm_vcpu *vcpu)
		long psr;
		local_irq_save(psr);
		r = kvm_insert_vmm_mapping(vcpu);
		local_irq_restore(psr);
		if (r)
		goto fail;

		@@ -2013,7 +2014,6 @@ static int vcpu_reset(struct kvm_vcpu *vcpu)
		kvm_purge_vmm_mapping(vcpu);
		r = 0;
		fail:
		local_irq_restore(psr);
		return r;
		}