diff --git a/[refs] b/[refs] index 7f3cd243bfcc..42a8065026a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdf71a10c7b6432d9b48e292cca2c62a0b9fa6cf +refs/heads/master: fcfd50afb6e94c8cf121ca4e7e3e7166bae7c6aa diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 3df84ea6aba9..37cf07aa4164 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -4918,7 +4918,7 @@ static void show_task(struct task_struct *p) } #endif printk(KERN_CONT "%5lu %5d %6d\n", free, - task_pid_nr(p), task_pid_nr(p->parent)); + task_pid_nr(p), task_pid_nr(p->real_parent)); if (state != TASK_RUNNING) show_stack(p, NULL);