Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus

[firefly-linux-kernel-4.4.55.git] / kernel / pid.c

diff --git a/kernel/pid.c b/kernel/pid.c
index 4fd07d5b7baf3b0176388b8ce0f06511b56ba2cc..ca368793808e37688f7b0219b54d458fede30765 100644 (file)
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -451,9 +451,8 @@ EXPORT_SYMBOL(pid_task);
  */
 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
 {
-       rcu_lockdep_assert(rcu_read_lock_held(),
-                          "find_task_by_pid_ns() needs rcu_read_lock()"
-                          " protection");
+       RCU_LOCKDEP_WARN(!rcu_read_lock_held(),
+                        "find_task_by_pid_ns() needs rcu_read_lock() protection");
        return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
 }