This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / sparc64 / kernel / binfmt_aout32.c

diff --git a/arch/sparc64/kernel/binfmt_aout32.c b/arch/sparc64/kernel/binfmt_aout32.c
index 3dbf266..d2d37d9 100644 (file)
--- a/arch/sparc64/kernel/binfmt_aout32.c
+++ b/arch/sparc64/kernel/binfmt_aout32.c
@@ -239,7 +239,8 @@ static int load_aout32_binary(struct linux_binprm * bprm, struct pt_regs * regs)
        current->mm->brk = ex.a_bss +
                (current->mm->start_brk = N_BSSADDR(ex));
 
-       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;
@@ -247,10 +248,10 @@ static int load_aout32_binary(struct linux_binprm * bprm, struct pt_regs * regs)
                loff_t pos = fd_offset;
                /* Fuck me plenty... */
                error = do_brk(N_TXTADDR(ex), ex.a_text);
-               bprm->file->f_op->read(bprm->file, (char __user *)N_TXTADDR(ex),
+               bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
                          ex.a_text, &pos);
                error = do_brk(N_DATADDR(ex), ex.a_data);
-               bprm->file->f_op->read(bprm->file, (char __user *)N_DATADDR(ex),
+               bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex),
                          ex.a_data, &pos);
                goto beyond_if;
        }
@@ -259,7 +260,7 @@ static int load_aout32_binary(struct linux_binprm * bprm, struct pt_regs * regs)
                loff_t pos = fd_offset;
                do_brk(N_TXTADDR(ex) & PAGE_MASK,
                        ex.a_text+ex.a_data + PAGE_SIZE - 1);
-               bprm->file->f_op->read(bprm->file, (char __user *)N_TXTADDR(ex),
+               bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
                          ex.a_text+ex.a_data, &pos);
        } else {
                static unsigned long error_time;
@@ -273,8 +274,7 @@ static int load_aout32_binary(struct linux_binprm * bprm, struct pt_regs * regs)
                if (!bprm->file->f_op->mmap) {
                        loff_t pos = fd_offset;
                        do_brk(0, ex.a_text+ex.a_data);
-                       bprm->file->f_op->read(bprm->file,
-                                 (char __user *)N_TXTADDR(ex),
+                       bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
                                  ex.a_text+ex.a_data, &pos);
                        goto beyond_if;
                }