From 591bf8dc351b87391b8213a7e708700981db1b9c Mon Sep 17 00:00:00 2001
From: Michel Lespinasse <walken@google.com>
Date: Mon, 8 Oct 2012 16:30:01 -0700
Subject: [PATCH] --- yaml --- r: 332374 b: refs/heads/master c:
 ca42b26ab285edc5ee3f9faa48379d258db53c35 h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/mmap.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 727947a78caa..4fdfc4ac15a4 100644
--- 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
index 2ba27434e843..e3c365ff1b6a 100644
--- 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);