From 350e44d873a25adb9353f0095ed7d76338cf61e5 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 9 Jan 2008 08:05:12 -0800 Subject: [PATCH] --- yaml --- r: 75349 b: refs/heads/master c: fd0b45dfd1858c6b49d06355a460bcf36d654c06 h: refs/heads/master i: 75347: 60bfcf51db42cb96a8bcccf095105f320a533247 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8c5cf5df08e1..9a1e2b430c77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c9b7aa1eb40ab708ef3242f74b9a61487623168 +refs/heads/master: fd0b45dfd1858c6b49d06355a460bcf36d654c06 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);