diff options
| author |   Jes Sorensen <jes@sgi.com> | 2009-04-16 16:08:29 +0200 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2009-06-10 11:48:44 +0300 |
| commit | 457459c3c738dfb37226ba116ba301140da0d1fb (patch) | |
| tree | 666b628e63afdf0bce5aabbf8a0cefe5db5332f9 /arch/ia64/kvm | |
| parent | KVM: ia64: remove empty function vti_vcpu_load() (diff) | |
| download | linux-dev-457459c3c738dfb37226ba116ba301140da0d1fb.tar.xz linux-dev-457459c3c738dfb37226ba116ba301140da0d1fb.zip | |
KVM: ia64: restore irq state before calling kvm_vcpu_init
Make sure to restore the psr after calling kvm_insert_vmm_mapping()
which calls ia64_itr_entry() as it disables local interrupts and
kvm_vcpu_init() may sleep.
Avoids a warning from the lock debugging code.
Signed-off-by: Jes Sorensen <jes@sgi.com>
Acked-by : Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/ia64/kvm')
| -rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 726317144a6f..5b868db1e9f2 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -1290,6 +1290,7 @@ static int vti_vcpu_setup(struct kvm_vcpu *vcpu, int id) local_irq_save(psr); r = kvm_insert_vmm_mapping(vcpu); + local_irq_restore(psr); if (r) goto fail; r = kvm_vcpu_init(vcpu, vcpu->kvm, id); @@ -1307,13 +1308,11 @@ static int vti_vcpu_setup(struct kvm_vcpu *vcpu, int id) goto uninit; kvm_purge_vmm_mapping(vcpu); - local_irq_restore(psr); return 0; uninit: kvm_vcpu_uninit(vcpu); fail: - local_irq_restore(psr); return r; } |