Commit 7e3bba93 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-6.1-2' of... 

Merge tag 'kvm-s390-master-6.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

VSIE epdx shadowing fix
parents b7b275e6 0dd4cdcc

arch/s390/kvm/vsie.c

+3 −1
Original line number Diff line number Diff line
@@ -546,8 +546,10 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
	if (test_kvm_cpu_feat(vcpu->kvm, KVM_S390_VM_CPU_FEAT_CEI))

		scb_s->eca |= scb_o->eca & ECA_CEI;

	/* Epoch Extension */

	if (test_kvm_facility(vcpu->kvm, 139))

	if (test_kvm_facility(vcpu->kvm, 139)) {

		scb_s->ecd |= scb_o->ecd & ECD_MEF;

		scb_s->epdx = scb_o->epdx;

	}



	/* etoken */

	if (test_kvm_facility(vcpu->kvm, 156))