summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/sysirix.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /arch/mips/kernel/sysirix.c
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/kernel/sysirix.c')
-rw-r--r--arch/mips/kernel/sysirix.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c
index 338a1ce11..7dd1a21af 100644
--- a/arch/mips/kernel/sysirix.c
+++ b/arch/mips/kernel/sysirix.c
@@ -1,4 +1,4 @@
-/* $Id: sysirix.c,v 1.19 1999/06/13 16:30:33 ralf Exp $
+/* $Id: sysirix.c,v 1.20 1999/06/17 13:25:48 ralf Exp $
*
* sysirix.c: IRIX system call emulation.
*
@@ -34,6 +34,8 @@
/* 2,526 lines of complete and utter shit coming up... */
+extern int max_threads;
+
/* The sysmp commands supported thus far. */
#define MP_NPROCS 1 /* # processor in complex */
#define MP_NAPROCS 2 /* # active processors in complex */
@@ -100,7 +102,7 @@ asmlinkage int irix_prctl(struct pt_regs *regs)
case PR_MAXPROCS:
printk("irix_prctl[%s:%ld]: Wants PR_MAXPROCS\n",
current->comm, current->pid);
- error = NR_TASKS;
+ error = max_threads;
break;
case PR_ISBLOCKED: {
@@ -113,7 +115,7 @@ asmlinkage int irix_prctl(struct pt_regs *regs)
error = -ESRCH;
break;
}
- error = (task->next_run ? 0 : 1);
+ error = (task->run_list.next != NULL);
/* Can _your_ OS find this out that fast? */
break;
}
@@ -359,7 +361,7 @@ asmlinkage int irix_syssgi(struct pt_regs *regs)
retval = (MAX_ARG_PAGES >> 4); /* XXX estimate... */
goto out;
case 2:
- retval = NR_TASKS;
+ retval = max_threads;
goto out;
case 3:
retval = HZ;