diff options
| author | Linus Torvalds | 2013-01-16 19:17:09 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2013-01-16 19:17:09 +0100 |
| commit | 56400b55c0ba02a8abecbc541193ea6a309635ce (patch) | |
| tree | 71381a8fe979b7d4a76a857c03f9da518e593e7f /arch | |
| parent | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (diff) | |
| parent | s390/kvm: Fix BUG in include/linux/kvm_host.h:745 (diff) | |
| download | kernel-qcow2-linux-56400b55c0ba02a8abecbc541193ea6a309635ce.tar.gz kernel-qcow2-linux-56400b55c0ba02a8abecbc541193ea6a309635ce.tar.xz kernel-qcow2-linux-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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index c9011bfaabbe..f090e819bf71 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, |