|
@@ -573,8 +573,12 @@ again: remove_next = 1 + (end > next->vm_end);
|
|
*/
|
|
*/
|
|
if (vma->anon_vma && (importer || start != vma->vm_start)) {
|
|
if (vma->anon_vma && (importer || start != vma->vm_start)) {
|
|
anon_vma = vma->anon_vma;
|
|
anon_vma = vma->anon_vma;
|
|
|
|
+ VM_BUG_ON(adjust_next && next->anon_vma &&
|
|
|
|
+ anon_vma != next->anon_vma);
|
|
|
|
+ } else if (adjust_next && next->anon_vma)
|
|
|
|
+ anon_vma = next->anon_vma;
|
|
|
|
+ if (anon_vma)
|
|
anon_vma_lock(anon_vma);
|
|
anon_vma_lock(anon_vma);
|
|
- }
|
|
|
|
|
|
|
|
if (root) {
|
|
if (root) {
|
|
flush_dcache_mmap_lock(mapping);
|
|
flush_dcache_mmap_lock(mapping);
|