fix pgoff in "have to relocate" case of mremap()

[net-next-2.6.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index 84efffb2d2c4e2de0c2574a11fce4d558eb78b45..bbbbbf507ff347e0a66be4bef63c33a182a90a4f 100644 (file)
--- a/mm/mremap.c
+++ b/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;