X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=kernel%2Fpid.c;h=b08e697cd83f0944747d5624698d356cf0288090;hb=e2aed29f29d0d289df3b0b627b122832d4dc80fe;hp=2e17c9c92cbec3ff3ab5afbb9ec30ce0fbafcb21;hpb=417e315247ebc199d357855bb08d2a5264400565;p=safe%2Fjmp%2Flinux-2.6

diff --git a/kernel/pid.c b/kernel/pid.c
index 2e17c9c..b08e697 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -367,7 +367,7 @@ struct task_struct *pid_task(struct pid *pid, enum pid_type type)
 	struct task_struct *result = NULL;
 	if (pid) {
 		struct hlist_node *first;
-		first = rcu_dereference(pid->tasks[type].first);
+		first = rcu_dereference_check(pid->tasks[type].first, rcu_read_lock_held() || lockdep_is_held(&tasklist_lock));
 		if (first)
 			result = hlist_entry(first, struct task_struct, pids[(type)].node);
 	}