diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2020-03-30 09:02:26 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-03-30 09:02:26 -0400 |
| commit | 830948eb68265ac7f3f364aa9801550feafec0d6 (patch) | |
| tree | e68647af8a8d97d3a102168cef854b90c0e64562 /arch/s390 | |
| parent | Merge tag 'kvm-s390-next-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD (diff) | |
| parent | s390/gmap: return proper error code on ksm unsharing (diff) | |
| download | linux-dev-830948eb68265ac7f3f364aa9801550feafec0d6.tar.xz linux-dev-830948eb68265ac7f3f364aa9801550feafec0d6.zip | |
Merge tag 'kvm-s390-next-5.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Fix for error codes
- return the proper error to userspace when a signal interrupts the
KSM unsharing operation
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/mm/gmap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index 03c899849c38..2fbece47ef6f 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -2552,12 +2552,13 @@ int gmap_mark_unmergeable(void) { struct mm_struct *mm = current->mm; struct vm_area_struct *vma; + int ret; for (vma = mm->mmap; vma; vma = vma->vm_next) { - if (ksm_madvise(vma, vma->vm_start, vma->vm_end, - MADV_UNMERGEABLE, &vma->vm_flags)) { - return -ENOMEM; - } + ret = ksm_madvise(vma, vma->vm_start, vma->vm_end, + MADV_UNMERGEABLE, &vma->vm_flags); + if (ret) + return ret; } mm->def_flags &= ~VM_MERGEABLE; return 0; |