diff options
author | Alexander Graf <agraf@suse.de> | 2011-12-09 09:47:53 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2012-03-05 07:52:28 -0500 |
commit | d33ad328c0025c45f4688a769aeebddc342222c1 (patch) | |
tree | a19cbfe239e772d77da6aaebdef0b71bc813a215 /arch/powerpc/kvm | |
parent | 7d82714d4d1293edc57439c796750310866624b2 (diff) |
KVM: PPC: Book3s: PR: No irq_disable in vcpu_run
Somewhere during merges we ended up from
local_irq_enable()
foo();
local_irq_disable()
to always keeping irqs enabled during that part. However, we now
have the following code:
foo();
local_irq_disable()
which disables interrupts without the surrounding code enabling them
again! So let's remove that disable and be happy.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm')
-rw-r--r-- | arch/powerpc/kvm/book3s_pr.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index 19af2bf2b87d..857ecde0cfdf 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c | |||
@@ -983,8 +983,6 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) | |||
983 | 983 | ||
984 | kvm_guest_exit(); | 984 | kvm_guest_exit(); |
985 | 985 | ||
986 | local_irq_disable(); | ||
987 | |||
988 | current->thread.regs->msr = ext_msr; | 986 | current->thread.regs->msr = ext_msr; |
989 | 987 | ||
990 | /* Make sure we save the guest FPU/Altivec/VSX state */ | 988 | /* Make sure we save the guest FPU/Altivec/VSX state */ |