---

yaml --- r: 332374 b: refs/heads/master c: ca42b26 h: refs/heads/master v: v3
git-mirror · Oct 9, 2012 · 591bf8d · 591bf8d
1 parent c5f548f
commit 591bf8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 227e4047488d3ee0173a914275a7fd207ad51e5b
+refs/heads/master: ca42b26ab285edc5ee3f9faa48379d258db53c35
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
@@ -573,8 +573,12 @@ again:			remove_next = 1 + (end > next->vm_end);
 	 */
 	if (vma->anon_vma && (importer || start != vma->vm_start)) {
 		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);
-	}
 
 	if (root) {
 		flush_dcache_mmap_lock(mapping);