This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / x86_64 / ia32 / ia32_aout.c

diff --git a/arch/x86_64/ia32/ia32_aout.c b/arch/x86_64/ia32/ia32_aout.c
index 040e56f..b7b698c 100644 (file)
--- a/arch/x86_64/ia32/ia32_aout.c
+++ b/arch/x86_64/ia32/ia32_aout.c
@@ -216,19 +216,18 @@ end_coredump:
  * memory and creates the pointer tables from them, and puts their
  * addresses on the "stack", returning the new stack pointer value.
  */
-static u32 __user *create_aout_tables(char __user *p, struct linux_binprm *bprm)
+static u32 * create_aout_tables(char * p, struct linux_binprm * bprm)
 {
-       u32 __user *argv;
-       u32 __user *envp;
-       u32 __user *sp;
+       u32 *argv, *envp;
+       u32 * sp;
        int argc = bprm->argc;
        int envc = bprm->envc;
 
-       sp = (u32 __user *) ((-(unsigned long)sizeof(u32)) & (unsigned long) p);
+       sp = (u32 *) ((-(unsigned long)sizeof(u32)) & (unsigned long) p);
        sp -= envc+1;
-       envp = sp;
+       envp = (u32 *) sp;
        sp -= argc+1;
-       argv = sp;
+       argv = (u32 *) sp;
        put_user((unsigned long) envp,--sp);
        put_user((unsigned long) argv,--sp);
        put_user(argc,--sp);
@@ -309,7 +308,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
                (current->mm->start_brk = N_BSSADDR(ex));
        current->mm->free_area_cache = TASK_UNMAPPED_BASE;
 
-       current->mm->rss = 0;
+       // current->mm->rss = 0;
+       vx_rsspages_sub(current->mm, current->mm->rss);
        current->mm->mmap = NULL;
        compute_creds(bprm);
        current->flags &= ~PF_FORKNOEXEC;
@@ -404,7 +404,7 @@ beyond_if:
        }
 
        current->mm->start_stack =
-               (unsigned long)create_aout_tables((char __user *)bprm->p, bprm);
+               (unsigned long) create_aout_tables((char *) bprm->p, bprm);
        /* start thread */
        asm volatile("movl %0,%%fs" :: "r" (0)); \
        asm volatile("movl %0,%%es; movl %0,%%ds": :"r" (__USER32_DS));