diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-10-04 21:11:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-10-04 21:11:08 -0700 |
| commit | da3103c8efd7570939617bfa1f06fcdab9a9a11d (patch) | |
| tree | f0e07dbc22384372c17d6b836f3a794fef62eed8 /fs/proc/array.c | |
| parent | 799cc173710f8bac2e3d234445dbcf59483a872f (diff) | |
| parent | 11d3c5ea4e4b16afcbe5f0966ed44b8b8f5ce5e5 (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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 1eba76a6f603..7029fc9eb211 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -304,9 +304,9 @@ int proc_pid_stat(struct task_struct *task, char * buffer) mm = task->mm; if(mm) mm = mmgrab(mm); - if (task->tty) { - tty_pgrp = task->tty->pgrp; - tty_nr = new_encode_dev(tty_devnum(task->tty)); + if (process_tty(task)) { + tty_pgrp = process_tty(task)->pgrp; + tty_nr = new_encode_dev(tty_devnum(process_tty(task))); } task_unlock(task); if (mm) { @@ -345,7 +345,7 @@ int proc_pid_stat(struct task_struct *task, char * buffer) state, ppid, process_group(task), - task->session, + process_session(task), tty_nr, tty_pgrp, task->flags, |