Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56400b55 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents aa8b550c 83987ace

arch/s390/kvm/kvm-s390.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -613,7 +613,9 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) 
		kvm_s390_deliver_pending_interrupts(vcpu);

		kvm_s390_deliver_pending_interrupts(vcpu);





	vcpu->arch.sie_block->icptcode = 0;

	vcpu->arch.sie_block->icptcode = 0;

	preempt_disable();

	kvm_guest_enter();

	kvm_guest_enter();

	preempt_enable();

	VCPU_EVENT(vcpu, 6, "entering sie flags %x",

	VCPU_EVENT(vcpu, 6, "entering sie flags %x",

		   atomic_read(&vcpu->arch.sie_block->cpuflags));

		   atomic_read(&vcpu->arch.sie_block->cpuflags));

	trace_kvm_s390_sie_enter(vcpu,

	trace_kvm_s390_sie_enter(vcpu,