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 b9bc487..01c3f73 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -17,8 +17,6 @@
 #include <linux/highmem.h>
 #include <linux/security.h>
 #include <linux/vs_memory.h>
-#include <linux/syscalls.h>
-#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
@@ -332,7 +330,7 @@ unsigned long do_mremap(unsigned long addr,
        if (vma->vm_flags & VM_LOCKED) {
                unsigned long locked, lock_limit;
                locked = current->mm->locked_vm << PAGE_SHIFT;
-               lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+               lock_limit = current->rlim[RLIMIT_MEMLOCK].rlim_cur;
                locked += new_len - old_len;
                ret = -EAGAIN;
                if (locked > lock_limit && !capable(CAP_IPC_LOCK))
@@ -344,7 +342,7 @@ unsigned long do_mremap(unsigned long addr,
        }
        ret = -ENOMEM;
        if ((current->mm->total_vm << PAGE_SHIFT) + (new_len - old_len)
-           > current->signal->rlim[RLIMIT_AS].rlim_cur)
+           > current->rlim[RLIMIT_AS].rlim_cur)
                goto out;
        /* check context space, maybe only Private writable mapping? */
        if (!vx_vmpages_avail(current->mm, (new_len - old_len) >> PAGE_SHIFT))