Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / fs / proc / array.c

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 2571da43c7364b0d227b108f3ae1c85562e7eb15..4badde179b18ff8d1a3c5406dc393227b30918f1 100644 (file)
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -578,7 +578,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
                rsslim,
                mm ? mm->start_code : 0,
                mm ? mm->end_code : 0,
-               (permitted) ? task->stack_start : 0,
+               (permitted && mm) ? task->stack_start : 0,
                esp,
                eip,
                /* The signal information here is obsolete.