summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-16 10:17:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-16 10:17:09 -0800
commit56400b55c0ba02a8abecbc541193ea6a309635ce (patch)
tree71381a8fe979b7d4a76a857c03f9da518e593e7f /arch
parentaa8b550c892aa70837e36f4681cc5a20b1fea47d (diff)
parent83987ace22f541964bd0dbf83a3f6b0014ba3e1e (diff)
downloadlinux-3.10-56400b55c0ba02a8abecbc541193ea6a309635ce.tar.gz
linux-3.10-56400b55c0ba02a8abecbc541193ea6a309635ce.tar.bz2
linux-3.10-56400b55c0ba02a8abecbc541193ea6a309635ce.zip
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull s390 KVM fix from Gleb Natapov. * git://git.kernel.org/pub/scm/virt/kvm/kvm: s390/kvm: Fix BUG in include/linux/kvm_host.h:745
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kvm/kvm-s390.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index c9011bfaabb..f090e819bf7 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -613,7 +613,9 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)
kvm_s390_deliver_pending_interrupts(vcpu);
vcpu->arch.sie_block->icptcode = 0;
+ preempt_disable();
kvm_guest_enter();
+ preempt_enable();
VCPU_EVENT(vcpu, 6, "entering sie flags %x",
atomic_read(&vcpu->arch.sie_block->cpuflags));
trace_kvm_s390_sie_enter(vcpu,