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

Commit af0f339a authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

Merge tag 'kvm-s390-master-4.10-1' of... 

Merge tag 'kvm-s390-master-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext

avoid merge conflicts, pull update for master
also into next.
parents 4bead2a4 04478197

arch/s390/kvm/kvm-s390.c

+2 −2
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ static int kvm_s390_get_machine(struct kvm *kvm, struct kvm_device_attr *attr) 
	memcpy(&mach->fac_mask, kvm->arch.model.fac_mask,

	       S390_ARCH_FAC_LIST_SIZE_BYTE);

	memcpy((unsigned long *)&mach->fac_list, S390_lowcore.stfle_fac_list,

	       S390_ARCH_FAC_LIST_SIZE_BYTE);

	       sizeof(S390_lowcore.stfle_fac_list));

	if (copy_to_user((void __user *)attr->addr, mach, sizeof(*mach)))

		ret = -EFAULT;

	kfree(mach);
@@ -1445,7 +1445,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 


	/* Populate the facility mask initially. */

	memcpy(kvm->arch.model.fac_mask, S390_lowcore.stfle_fac_list,

	       S390_ARCH_FAC_LIST_SIZE_BYTE);

	       sizeof(S390_lowcore.stfle_fac_list));

	for (i = 0; i < S390_ARCH_FAC_LIST_SIZE_U64; i++) {

		if (i < kvm_s390_fac_list_mask_size())

			kvm->arch.model.fac_mask[i] &= kvm_s390_fac_list_mask[i];