diff options
| author |   Jes Sorensen <jes@sgi.com> | 2009-04-16 16:53:13 +0200 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2009-06-10 11:48:44 +0300 |
| commit | 4d13c3b04f14a9a72ffcdd082acc243e7e56b4e0 (patch) | |
| tree | 58556c7fdcc858df3db9d5111558d50bb7ec7d5b /arch/ia64/kvm | |
| parent | KVM: ia64: restore irq state before calling kvm_vcpu_init (diff) | |
| download | linux-dev-4d13c3b04f14a9a72ffcdd082acc243e7e56b4e0.tar.xz linux-dev-4d13c3b04f14a9a72ffcdd082acc243e7e56b4e0.zip | |
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: 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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 5b868db1e9f2..cf5a19390f4e 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -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) |