This commit was manufactured by cvs2svn to create tag

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

diff --git a/mm/mremap.c b/mm/mremap.c
index c1cf3c0..99b2576 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -334,10 +334,6 @@ unsigned long do_mremap(unsigned long addr,
                ret = -EAGAIN;
                if (locked > lock_limit && !capable(CAP_IPC_LOCK))
                        goto out;
-               ret = -ENOMEM;
-               if (!vx_vmlocked_avail(current->mm,
-                       (new_len - old_len) >> PAGE_SHIFT))
-                       goto out;
        }
        ret = -ENOMEM;
        if ((current->mm->total_vm << PAGE_SHIFT) + (new_len - old_len)
@@ -373,7 +369,7 @@ unsigned long do_mremap(unsigned long addr,
                        vx_vmpages_add(current->mm, pages);
                        if (vma->vm_flags & VM_LOCKED) {
                                // current->mm->locked_vm += pages;
-                               vx_vmlocked_add(vma->vm_mm, pages);
+                               vx_vmlocked_add(current->mm, pages);
                                make_pages_present(addr + old_len,
                                                   addr + new_len);
                        }
@@ -393,8 +389,9 @@ 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,
+                                               vma->vm_flags & VM_EXEC);
                        ret = new_addr;
                        if (new_addr & ~PAGE_MASK)
                                goto out;