diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /kernel/info.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'kernel/info.c')
| -rw-r--r-- | kernel/info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/info.c b/kernel/info.c index 1dffddc7b..3ee347444 100644 --- a/kernel/info.c +++ b/kernel/info.c @@ -13,7 +13,7 @@ #include <asm/uaccess.h> -asmlinkage int sys_sysinfo(struct sysinfo *info) +asmlinkage long sys_sysinfo(struct sysinfo *info) { struct sysinfo val; @@ -26,7 +26,7 @@ asmlinkage int sys_sysinfo(struct sysinfo *info) val.loads[1] = avenrun[1] << (SI_LOAD_SHIFT - FSHIFT); val.loads[2] = avenrun[2] << (SI_LOAD_SHIFT - FSHIFT); - val.procs = nr_tasks-1; + val.procs = nr_threads-1; sti(); si_meminfo(&val); |