Merge tag 'kvm-s390-master-4.8-3' of...

Merge tag 'kvm-s390-master-4.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master

A bugfix for the vsie code (setting the wrong field).

parents e12c8f36 4d21cef3

arch/s390/kvm/vsie.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -584,7 +584,7 @@ static int pin_blocks(struct kvm_vcpu vcpu, struct vsie_page vsie_page)
	/* Validity 0x0044 will be checked by SIE */		/* Validity 0x0044 will be checked by SIE */
	if (rc)		if (rc)
	goto unpin;		goto unpin;
	scb_s->gvrd = hpa;		scb_s->riccbd = hpa;
	}		}
	return 0;		return 0;
	unpin:		unpin: