From c988cde6392fdd4998ee818dfdb905fcf9259117 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Fri, 19 Jun 2009 02:51:13 +0200
Subject: [PATCH] --- yaml --- r: 155749 b: refs/heads/master c:
 9ae260270c90643156cda73427aa1f04c923e627 h: refs/heads/master i:   155747:
 b39c772ad1f77a26b11e26df4ff34590a6977130 v: v3

---
 [refs]                 |  2 +-
 trunk/kernel/kthread.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 348f97fa8eb1..88a3fe7da943 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6560dc160f3a96b8f1f43e2c6b51aa6eb9898b90
+refs/heads/master: 9ae260270c90643156cda73427aa1f04c923e627
diff --git a/trunk/kernel/kthread.c b/trunk/kernel/kthread.c
index 9b1a7de26979..eb8751aa0418 100644
--- a/trunk/kernel/kthread.c
+++ b/trunk/kernel/kthread.c
@@ -180,10 +180,12 @@ EXPORT_SYMBOL(kthread_bind);
  * @k: thread created by kthread_create().
  *
  * Sets kthread_should_stop() for @k to return true, wakes it, and
- * waits for it to exit.  Your threadfn() must not call do_exit()
- * itself if you use this function!  This can also be called after
- * kthread_create() instead of calling wake_up_process(): the thread
- * will exit without calling threadfn().
+ * waits for it to exit. This can also be called after kthread_create()
+ * instead of calling wake_up_process(): the thread will exit without
+ * calling threadfn().
+ *
+ * If threadfn() may call do_exit() itself, the caller must ensure
+ * task_struct can't go away.
  *
  * Returns the result of threadfn(), or %-EINTR if wake_up_process()
  * was never called.