Commit f52d1d03 authored by Linus Torvalds's avatar Linus Torvalds

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

parent 5ac8451a
...@@ -369,6 +369,8 @@ static inline int is_mergeable_vma(struct vm_area_struct *vma, ...@@ -369,6 +369,8 @@ static inline int is_mergeable_vma(struct vm_area_struct *vma,
return 0; return 0;
if (vma->vm_flags != vm_flags) if (vma->vm_flags != vm_flags)
return 0; return 0;
if (vma->vm_private_data)
return 0;
return 1; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment