Never merge vma's that have mapping-private data.

diff --git a/mm/mmap.c b/mm/mmap.c
index cdf4acebf6f584d691da3ea070cd1cb81983ed0b..cb35e2d7f1e247c293d836826da39df4f619e283 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -369,6 +369,8 @@ static inline int is_mergeable_vma(struct vm_area_struct *vma,
                return 0;
        if (vma->vm_flags != vm_flags)
                return 0;
+       if (vma->vm_private_data)
+               return 0;
        return 1;
 }