summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-11 13:13:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-11 13:13:32 -0700
commit4004f02d7af9bb1f5fd993fba60ed5bd0f5397a9 (patch)
tree3d7d6dbd82b514550491d93c7a850394deba3f49 /kernel
parent332a3392188e0ad966543c87b8da2b9d246f301d (diff)
parent5b0f437df0a3e374d26ad533eb78fe64744f55a8 (diff)
downloadlinux-4004f02d7af9bb1f5fd993fba60ed5bd0f5397a9.tar.bz2
Merge branch 'core-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: workqueues: Improve schedule_work() documentation
Diffstat (limited to 'kernel')
-rw-r--r--kernel/workqueue.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 0668795d8818..3c44b56b0da7 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -600,7 +600,12 @@ static struct workqueue_struct *keventd_wq __read_mostly;
* schedule_work - put work task in global workqueue
* @work: job to be done
*
- * This puts a job in the kernel-global workqueue.
+ * Returns zero if @work was already on the kernel-global workqueue and
+ * non-zero otherwise.
+ *
+ * This puts a job in the kernel-global workqueue if it was not already
+ * queued and leaves it in the same position on the kernel-global
+ * workqueue otherwise.
*/
int schedule_work(struct work_struct *work)
{