Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-block.git] / arch / s390 / mm / gmap.c

diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index 8492a3f5642ef8f9dd63c7b2afee759ba85d72b2..dc90d1eb0d554f920712929783826cd32843091b 100644 (file)
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -2585,30 +2585,12 @@ EXPORT_SYMBOL_GPL(s390_enable_sie);
 
 int gmap_mark_unmergeable(void)
 {
-       struct mm_struct *mm = current->mm;
-       struct vm_area_struct *vma;
-       unsigned long vm_flags;
-       int ret;
-       VMA_ITERATOR(vmi, mm, 0);
-
        /*
         * Make sure to disable KSM (if enabled for the whole process or
         * individual VMAs). Note that nothing currently hinders user space
         * from re-enabling it.
         */
-       clear_bit(MMF_VM_MERGE_ANY, &mm->flags);
-
-       for_each_vma(vmi, vma) {
-               /* Copy vm_flags to avoid partial modifications in ksm_madvise */
-               vm_flags = vma->vm_flags;
-               ret = ksm_madvise(vma, vma->vm_start, vma->vm_end,
-                                 MADV_UNMERGEABLE, &vm_flags);
-               if (ret)
-                       return ret;
-               vm_flags_reset(vma, vm_flags);
-       }
-       mm->def_flags &= ~VM_MERGEABLE;
-       return 0;
+       return ksm_disable(current->mm);
 }
 EXPORT_SYMBOL_GPL(gmap_mark_unmergeable);