Update of /cvsroot/linux-mips/linux/fs/proc
In directory usw-pr-cvs1:/tmp/cvs-serv10490/fs/proc
Modified Files:
array.c proc_misc.c
Log Message:
Sync with OSS 2.4.13.
Index: array.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/fs/proc/array.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- array.c 2001/10/19 21:19:40 1.5
+++ array.c 2001/11/06 02:57:38 1.6
@@ -151,12 +151,13 @@
read_lock(&tasklist_lock);
buffer += sprintf(buffer,
"State:\t%s\n"
+ "Tgid:\t%d\n"
"Pid:\t%d\n"
"PPid:\t%d\n"
"TracerPid:\t%d\n"
"Uid:\t%d\t%d\t%d\t%d\n"
"Gid:\t%d\t%d\t%d\t%d\n",
- get_task_state(p),
+ get_task_state(p), p->tgid,
p->pid, p->pid ? p->p_opptr->pid : 0, 0,
p->uid, p->euid, p->suid, p->fsuid,
p->gid, p->egid, p->sgid, p->fsgid);
Index: proc_misc.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/fs/proc/proc_misc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- proc_misc.c 2001/10/19 21:19:40 1.3
+++ proc_misc.c 2001/11/06 02:57:38 1.4
@@ -140,6 +140,7 @@
{
struct sysinfo i;
int len;
+ int pg_size ;
/*
* display in kilobytes.
@@ -148,12 +149,14 @@
#define B(x) ((unsigned long long)(x) << PAGE_SHIFT)
si_meminfo(&i);
si_swapinfo(&i);
+ pg_size = atomic_read(&page_cache_size) - i.bufferram ;
+
len = sprintf(page, " total: used: free: shared: buffers: cached:\n"
"Mem: %8Lu %8Lu %8Lu %8Lu %8Lu %8Lu\n"
"Swap: %8Lu %8Lu %8Lu\n",
B(i.totalram), B(i.totalram-i.freeram), B(i.freeram),
B(i.sharedram), B(i.bufferram),
- B(atomic_read(&page_cache_size)), B(i.totalswap),
+ B(pg_size), B(i.totalswap),
B(i.totalswap-i.freeswap), B(i.freeswap));
/*
* Tagged format, for easy grepping and expansion.
@@ -179,7 +182,7 @@
K(i.freeram),
K(i.sharedram),
K(i.bufferram),
- K(atomic_read(&page_cache_size) - swapper_space.nrpages),
+ K(pg_size - swapper_space.nrpages),
K(swapper_space.nrpages),
K(nr_active_pages),
K(nr_inactive_pages),
|
