Commit 43890ae8 authored by Jes Sorensen's avatar Jes Sorensen Committed by Avi Kivity

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: 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 4d13c3b0
...@@ -2001,6 +2001,7 @@ static int vcpu_reset(struct kvm_vcpu *vcpu) ...@@ -2001,6 +2001,7 @@ static int vcpu_reset(struct kvm_vcpu *vcpu)
long psr; long psr;
local_irq_save(psr); local_irq_save(psr);
r = kvm_insert_vmm_mapping(vcpu); r = kvm_insert_vmm_mapping(vcpu);
local_irq_restore(psr);
if (r) if (r)
goto fail; goto fail;
...@@ -2013,7 +2014,6 @@ static int vcpu_reset(struct kvm_vcpu *vcpu) ...@@ -2013,7 +2014,6 @@ static int vcpu_reset(struct kvm_vcpu *vcpu)
kvm_purge_vmm_mapping(vcpu); kvm_purge_vmm_mapping(vcpu);
r = 0; r = 0;
fail: fail:
local_irq_restore(psr);
return r; return r;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment