diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2017-01-30 11:19:20 +0100 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2017-01-30 11:19:20 +0100 |
| commit | af0f339a6c18468421a67f361a60f14bc5144345 (patch) | |
| tree | 2dc241fb2ce0617e98721a30c515538daf03fb1d /arch/s390 | |
| parent | 4bead2a423ea5268b0ab3cba058e215c65ee2cbd (diff) | |
| parent | 04478197416e3a302e9ebc917ba1aa884ef9bfab (diff) | |
| download | linux-af0f339a6c18468421a67f361a60f14bc5144345.tar.gz linux-af0f339a6c18468421a67f361a60f14bc5144345.tar.xz | |
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.
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 66e73f4ed64b..4078ba630689 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -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]; |