From 650ee3c4b71bcf96e0184f87dadb86d90560e049 Mon Sep 17 00:00:00 2001
From: Joonsoo Kim <js1304@gmail.com>
Date: Wed, 12 Dec 2012 13:51:53 -0800
Subject: [PATCH] --- yaml --- r: 343329 b: refs/heads/master c:
 2897b4d29d9fca82a57b09b8a216a5d604966e4b h: refs/heads/master i:   343327:
 a0149e8919be2f96a5b45eeee13f986eb0bde64a v: v3

---
 [refs]          | 2 +-
 trunk/mm/mmap.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9fa702824919..6abd085262f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44e33e8f95171b93968c3ac3cf8516998b1db65d
+refs/heads/master: 2897b4d29d9fca82a57b09b8a216a5d604966e4b
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index f940062c8d4b..9ed3a06242a0 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -1488,7 +1488,11 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 		 *
 		 * Answer: Yes, several device drivers can do it in their
 		 *         f_op->mmap method. -DaveM
+		 * Bug: If addr is changed, prev, rb_link, rb_parent should
+		 *      be updated for vma_link()
 		 */
+		WARN_ON_ONCE(addr != vma->vm_start);
+
 		addr = vma->vm_start;
 		pgoff = vma->vm_pgoff;
 		vm_flags = vma->vm_flags;