linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index c6b8da2..d516bf7 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -18,12 +18,14 @@
 #include <linux/highmem.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/vs_base.h>
 #include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 
+
 static pmd_t *get_old_pmd(struct mm_struct *mm, unsigned long addr)
 {
        pgd_t *pgd;
@@ -391,8 +393,8 @@ unsigned long do_mremap(unsigned long addr,
                        if (vma->vm_flags & VM_MAYSHARE)
                                map_flags |= MAP_SHARED;
 
-                       new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len,
-                               vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC);
+                       new_addr = get_unmapped_area(vma->vm_file, 0, new_len,
+                                               vma->vm_pgoff, map_flags);
                        ret = new_addr;
                        if (new_addr & ~PAGE_MASK)
                                goto out;