summaryrefslogtreecommitdiff
path: root/fs/proc/array.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 18:07:03 -0800
committerLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 18:07:03 -0800
commit3544b3289d633721041f6d96d0efee8f79cd435b (patch)
treea5b201286eb880200347c923b115a19b97b7ff3d /fs/proc/array.c
parent27c07b258df990ce981108198eca19b2512a202a (diff)
v2.4.3 -> v2.4.3.1
- Bob Tracy: Cyrix MTRR setup fix (don't make it twice as big as asked for) - Trond Myklebust: rpciod needs to be PF_MEMALLOC to avoid deadlocks on memory allocation when writing out NFS data under low memory conditions. Fix up BKL and RPC interactions. - Jeff Garzik: tulip network driver update - fix truncate to call down to the filesystem with the kernel lock. - David Mosberger: ia64 update - David Mosberger: simplify ELF program header generation. - Alan Cox: merge from -ac series - Jeff Garzik: make serial.c recognize modem devices properly
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r--fs/proc/array.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 35d1ff77eb4f..e2b5720775b8 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -273,9 +273,6 @@ int proc_pid_status(struct task_struct *task, char * buffer)
{
char * orig = buffer;
struct mm_struct *mm;
-#if defined(CONFIG_ARCH_S390)
- int line,len;
-#endif
buffer = task_name(task, buffer);
buffer = task_state(task, buffer);
@@ -291,8 +288,7 @@ int proc_pid_status(struct task_struct *task, char * buffer)
buffer = task_sig(task, buffer);
buffer = task_cap(task, buffer);
#if defined(CONFIG_ARCH_S390)
- for(line=0;(len=sprintf_regs(line,buffer,task,NULL,NULL))!=0;line++)
- buffer+=len;
+ buffer = task_show_regs(task, buffer);
#endif
return buffer - orig;
}