This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / mips / kernel / irixelf.c

diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c
index 6a2b362..0bcfb5a 100644 (file)
--- a/arch/mips/kernel/irixelf.c
+++ b/arch/mips/kernel/irixelf.c
@@ -686,7 +686,8 @@ static int load_irix_binary(struct linux_binprm * bprm, struct pt_regs * regs)
        /* Do this so that we can load the interpreter, if need be.  We will
         * change some of these later.
         */
-       current->mm->rss = 0;
+       // current->mm->rss = 0;
+       vx_rsspages_sub(current->mm, current->mm->rss);
        setup_arg_pages(bprm, EXSTACK_DEFAULT);
        current->mm->start_stack = bprm->p;
 
@@ -1130,7 +1131,7 @@ static int irix_core_dump(long signr, struct pt_regs * regs, struct file *file)
        psinfo.pr_pid = prstatus.pr_pid = current->pid;
        psinfo.pr_ppid = prstatus.pr_ppid = current->parent->pid;
        psinfo.pr_pgrp = prstatus.pr_pgrp = process_group(current);
-       psinfo.pr_sid = prstatus.pr_sid = current->session;
+       psinfo.pr_sid = prstatus.pr_sid = current->signal->session;
        prstatus.pr_utime.tv_sec = CT_TO_SECS(current->utime);
        prstatus.pr_utime.tv_usec = CT_TO_USECS(current->utime);
        prstatus.pr_stime.tv_sec = CT_TO_SECS(current->stime);