diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 01:16:30 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 01:16:30 -0500 |
| commit | 1e43bee9c70654b4d52472c19e5f0a0cc18b6b36 (patch) | |
| tree | ff601ec0c0d14125d0324f21b3c7e6d5e19fa252 /fs/proc/array.c | |
| parent | 7d6709a20866a885916214590b7c394a21be9e25 (diff) | |
| parent | a8a8a669ea13d792296737505adc43ccacf3a648 (diff) | |
Merge commit 'origin/master' into next
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 07f77a7945c3..822c2d506518 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
| @@ -571,7 +571,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | |||
| 571 | rsslim, | 571 | rsslim, |
| 572 | mm ? mm->start_code : 0, | 572 | mm ? mm->start_code : 0, |
| 573 | mm ? mm->end_code : 0, | 573 | mm ? mm->end_code : 0, |
| 574 | (permitted) ? task->stack_start : 0, | 574 | (permitted && mm) ? task->stack_start : 0, |
| 575 | esp, | 575 | esp, |
| 576 | eip, | 576 | eip, |
| 577 | /* The signal information here is obsolete. | 577 | /* The signal information here is obsolete. |