diff --git a/[refs] b/[refs]
index 93577874c975..55d2f639364d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 097eed103862f9c6a97f2e415e21d1134017b135
+refs/heads/master: 935874141df839c706cd6cdc438e85eb69d1525e
diff --git a/trunk/mm/mremap.c b/trunk/mm/mremap.c
index 84efffb2d2c4..bbbbbf507ff3 100644
--- a/trunk/mm/mremap.c
+++ b/trunk/mm/mremap.c
@@ -495,7 +495,9 @@ unsigned long do_mremap(unsigned long addr,
 			map_flags |= MAP_SHARED;
 
 		new_addr = get_unmapped_area(vma->vm_file, 0, new_len,
-					vma->vm_pgoff, map_flags);
+					vma->vm_pgoff +
+					((addr - vma->vm_start) >> PAGE_SHIFT),
+					map_flags);
 		if (new_addr & ~PAGE_MASK) {
 			ret = new_addr;
 			goto out;