From f95d7a9b766299dae93e7b13217d20087a92ea00 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Thu, 15 Dec 2011 08:49:18 -0800 Subject: [PATCH] --- yaml --- r: 277403 b: refs/heads/master c: 07cde2608a3b5c66515363f1b53623b1536b9785 h: refs/heads/master i: 277401: 6873678e7cd6ddb99c1ac61494a86f9c81bf98c4 277399: 5d45750deeb3bc3a4a608b732543a54712af03d6 v: v3 --- [refs] | 2 +- trunk/kernel/sched/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4ccf9a020a09..c934edaefcea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abd63bc3a0f65ae9d85bc3b1bb067d3e3c2b2cc2 +refs/heads/master: 07cde2608a3b5c66515363f1b53623b1536b9785 diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c index 3c5b21e2ef20..c7ea688faff4 100644 --- a/trunk/kernel/sched/core.c +++ b/trunk/kernel/sched/core.c @@ -4784,7 +4784,7 @@ void sched_show_task(struct task_struct *p) free = stack_not_used(p); #endif printk(KERN_CONT "%5lu %5d %6d 0x%08lx\n", free, - task_pid_nr(p), task_pid_nr(p->real_parent), + task_pid_nr(p), task_pid_nr(rcu_dereference(p->real_parent)), (unsigned long)task_thread_info(p)->flags); show_stack(p, NULL);