diff options
| author | James Morris <jmorris@macbook.(none)> | 2009-12-03 01:33:40 -0500 |
|---|---|---|
| committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 01:33:40 -0500 |
| commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
| tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /fs/proc/array.c | |
| parent | 7539cf4b92be4aecc573ea962135f246a7a33401 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch '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. |