Commit 7650b687 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-urgent' of... 

Merge branch 'kvm-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-queue

A fix for a regression that is in current kvm/next, which is
targetted for 3.14.
parents 94491620 699bde3b

arch/s390/kvm/kvm-s390.c

+4 −0
Original line number Diff line number Diff line
@@ -738,6 +738,10 @@ static int vcpu_post_run(struct kvm_vcpu *vcpu, int exit_reason) 
						current->thread.gmap_addr;

		vcpu->run->s390_ucontrol.pgm_code = 0x10;

		rc = -EREMOTE;

	} else {

		VCPU_EVENT(vcpu, 3, "%s", "fault in sie instruction");

		trace_kvm_s390_sie_fault(vcpu);

		rc = kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);

	}



	memcpy(&vcpu->run->s.regs.gprs[14], &vcpu->arch.sie_block->gg14, 16);