diff --git a/[refs] b/[refs] index 8122412cdc75..e7c4775bd6c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ad696d2cf535772dff659298ec7e7260e344595 +refs/heads/master: 9ebd4eba761b624a6a6c9189335adeddcb1fa0e0 diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c index 07f77a7945c3..822c2d506518 100644 --- a/trunk/fs/proc/array.c +++ b/trunk/fs/proc/array.c @@ -571,7 +571,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.