Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6.git] / kernel / pid.c

diff --git a/kernel/pid.c b/kernel/pid.c
index 86b296943e5f274c2b4965a73275661a4c6c727e..aebb30d9c233df40876afa35ef21cc5c306590a1 100644 (file)
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -367,7 +367,9 @@ struct task_struct *pid_task(struct pid *pid, enum pid_type type)
        struct task_struct *result = NULL;
        if (pid) {
                struct hlist_node *first;
        struct task_struct *result = NULL;
        if (pid) {
                struct hlist_node *first;

-               first = rcu_dereference_check(pid->tasks[type].first, rcu_read_lock_held() || lockdep_is_held(&tasklist_lock));
+               first = rcu_dereference_check(pid->tasks[type].first,
+                                             rcu_read_lock_held() ||
+                                             lockdep_tasklist_lock_is_held());

                if (first)
                        result = hlist_entry(first, struct task_struct, pids[(type)].node);
        }
                if (first)
                        result = hlist_entry(first, struct task_struct, pids[(type)].node);
        }