diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:57:21 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:57:21 -0600 |
| commit | 54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch) | |
| tree | 40619a66ae6d8703a57bf681d087ffeabbffd346 /fs/proc/array.c | |
| parent | 8ce0a7df6e6117d8814e976d4b7ce6a6b2c9cf93 (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
| download | kernel-crypto-54c66f6d781e03dc0b23956234963c4911e6d1c0.tar.gz kernel-crypto-54c66f6d781e03dc0b23956234963c4911e6d1c0.tar.xz kernel-crypto-54c66f6d781e03dc0b23956234963c4911e6d1c0.zip | |
Merge branch 'master' into 85xx
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 70e4fab117b..07c9cdbcdca 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -351,7 +351,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole) struct signal_struct *sig = task->signal; if (sig->tty) { - tty_pgrp = sig->tty->pgrp; + tty_pgrp = pid_nr(sig->tty->pgrp); tty_nr = new_encode_dev(tty_devnum(sig->tty)); } |