diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-22 22:59:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-22 22:59:04 -0700 |
| commit | ab168caf67c5ac1c99a1aca5679d9bd0e07ba43e (patch) | |
| tree | a06b41f0d72abbad84b1cd374564a3665147a69d /fs/proc/array.c | |
| parent | 843a763d740fa12ebe6c50d44638670fcf881224 (diff) | |
| parent | d3861d447abddde9057cbf7ed6f8c090bd063bdc (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index bf39eb5013b0..f38e5d249fab 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -306,7 +306,7 @@ int proc_pid_stat(struct task_struct *task, char * buffer) mm = mmgrab(mm); if (task->tty) { tty_pgrp = task->tty->pgrp; - tty_nr = task->tty->device; + tty_nr = tty_devnum(task->tty); } task_unlock(task); if (mm) { |