diff options
| author | Arnd Bergmann | 2011-07-28 17:25:46 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2011-07-28 17:25:46 +0200 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /kernel/pid.c | |
| parent | arm/dt: tegra devicetree support (diff) | |
| parent | dmaengine: imx-sdma: add device tree probe support (diff) | |
| download | kernel-qcow2-linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.gz kernel-qcow2-linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.xz kernel-qcow2-linux-6124a4e430b64d1577438c8648c59e996d02e73e.zip | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'kernel/pid.c')
| -rw-r--r-- | kernel/pid.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index 57a8346a270e..e432057f3b21 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -405,7 +405,6 @@ struct task_struct *pid_task(struct pid *pid, enum pid_type type) if (pid) { struct hlist_node *first; first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]), - rcu_read_lock_held() || lockdep_tasklist_lock_is_held()); if (first) result = hlist_entry(first, struct task_struct, pids[(type)].node); |