---

yaml
---
r: 174847
b: refs/heads/master
c: 097eed1
h: refs/heads/master
i:
  174845: d6b7b0b
  174843: 88f786b
  174839: 896bd9a
  174831: 4a9a7b8
  174815: b4c7581
  174783: 0b21ed3
  174719: 54ce1bc
  174591: 176efaa
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f106af4e90eadd76cfc0b5325f659619e08fb762
+refs/heads/master: 097eed103862f9c6a97f2e415e21d1134017b135

trunk/mm/mremap.c

@@ -325,6 +325,7 @@ static unsigned long mremap_to(unsigned long addr,
 	struct vm_area_struct *vma;
 	unsigned long ret = -EINVAL;
 	unsigned long charged = 0;
+	unsigned long map_flags;
 
 	if (new_addr & ~PAGE_MASK)
 		goto out;
@@ -362,9 +363,23 @@ static unsigned long mremap_to(unsigned long addr,
 		goto out;
 	}
 
-	ret = move_vma(vma, addr, old_len, new_len, new_addr);
+	map_flags = MAP_FIXED;
+	if (vma->vm_flags & VM_MAYSHARE)
+		map_flags |= MAP_SHARED;
+	ret = arch_mmap_check(new_addr, new_len, map_flags);
+	if (ret)
+		goto out1;
+	ret = get_unmapped_area(vma->vm_file, new_addr, new_len, vma->vm_pgoff +
+				((addr - vma->vm_start) >> PAGE_SHIFT),
+				map_flags);
 	if (ret & ~PAGE_MASK)
-		vm_unacct_memory(charged);
+		goto out1;
+
+	ret = move_vma(vma, addr, old_len, new_len, new_addr);
+	if (!(ret & ~PAGE_MASK))
+		goto out;
+out1:
+	vm_unacct_memory(charged);
 
 out:
 	return ret;