Merge branch 'next' into for-linus

1 files changed, 4 insertions, 2 deletions

diff --git a/kernel/pid.c b/kernel/pid.c
index e432057f3b21..fa5f72227e5f 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -27,7 +27,7 @@
  */
 
 #include <linux/mm.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/rculist.h>
@@ -418,7 +418,9 @@ 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());
+        rcu_lockdep_assert(rcu_read_lock_held(),
+                           "find_task_by_pid_ns() needs rcu_read_lock()"
+                           " protection");
         return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
 }