Merge tag 'kvm-s390-next-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git...

[thirdparty/linux.git] / arch / s390 / mm / gmap.c

diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index 2267cf9819b2f145b7894bb2242361d7ebaf9a0f..8492a3f5642ef8f9dd63c7b2afee759ba85d72b2 100644 (file)
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -2591,6 +2591,13 @@ int gmap_mark_unmergeable(void)
        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;