diff -NurpP --minimal linux-2.4.24-ck1-vs1.3.4/fs/proc/virtual.c linux-2.4.24-ck1-vs1.3.4-iw01/fs/proc/virtual.c --- linux-2.4.24-ck1-vs1.3.4/fs/proc/virtual.c Tue Jan 6 07:06:59 2004 +++ linux-2.4.24-ck1-vs1.3.4-iw01/fs/proc/virtual.c Wed Jan 7 01:21:04 2004 @@ -93,9 +93,17 @@ char *vx_proc_status (void *data, char * "RefC:\t%d\n" "Flags:\t%08x\n" "Ticks:\t%d\n" + "nr_threads:\t%d\n" + "nr_running:\t%d\n" + "max_threads:\t%d\n" + "total_forks:\t%d\n" ,atomic_read(&vxi->vx_refcount) ,vxi->vx_flags - ,atomic_read(&vxi->limit.ticks)); + ,atomic_read(&vxi->limit.ticks) + ,vxi->virt.nr_threads + ,vxi->virt.nr_running + ,vxi->virt.max_threads + ,vxi->virt.total_forks); put_vx_info(vxi); return buffer; } @@ -113,9 +121,12 @@ char *vx_proc_limit (void *data, char *b struct vx_info *vxi = find_vx_info((int)data); if (vxi) buffer += sprintf(buffer, + "PROC:\t%8d/%ld\n" "VM:\t%8d/%ld\n" "VML:\t%8d/%ld\n" "RSS:\t%8d/%ld\n" + ,atomic_read(&vxi->limit.res[RLIMIT_NPROC]) + ,vxi->limit.rlim[RLIMIT_NPROC] ,atomic_read(&vxi->limit.res[RLIMIT_AS]) ,vxi->limit.rlim[RLIMIT_AS] ,atomic_read(&vxi->limit.res[RLIMIT_MEMLOCK])