History

Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

Pull workqueue updates from Tejun Heo: "Only three trivial changes for workqueue this time - doc, MAINTAINERS and EXPORT_SYMBOL updates" * 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: fix some docbook warnings workqueue: Make flush_workqueue() available again to non GPL modules workqueue: add myself as a dedicated reviwer

Linus Torvalds committed 11 years ago

Commit 7d3e2eb2 parents 2dc7e55 355c0663 files · +5 −4Browse files

Unified · Split

3 files
  1. MAINTAINERS +1 −0
  2. include/linux/workqueue.h +3 −3
  3. kernel/workqueue.c +1 −1
MAINTAINERS+1−0
@@ -11244,6 +11244,7 @@ F: sound/soc/codecs/wm* · 11243 unmodified lines
1124411244
1124511245 WORKQUEUE
1124611246 M: Tejun Heo <tj@kernel.org>
11247+R: Lai Jiangshan <jiangshanlai@gmail.com>
1124711248 T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
1124811249 S: Maintained
1124911250 F: include/linux/workqueue.h
include/linux/workqueue.h+3−3
@@ -265,7 +265,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } · 264 unmodified lines
265265 /**
266266 * delayed_work_pending - Find out whether a delayable work item is currently
267267 * pending
268− * @work: The work item in question
268+ * @w: The work item in question
269269 */
270270 #define delayed_work_pending(w) \
271271 work_pending(&(w)->work)
@@ -366,7 +366,7 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active, · 94 unmodified lines
366366 * @fmt: printf format for the name of the workqueue
367367 * @flags: WQ_* flags
368368 * @max_active: max in-flight work items, 0 for default
369− * @args: args for @fmt
369+ * @args...: args for @fmt
370370 *
371371 * Allocate a workqueue with the specified parameters. For detailed
372372 * information on WQ_* flags, please refer to Documentation/workqueue.txt.
@@ -398,7 +398,7 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active, · 25 unmodified lines
398398 * alloc_ordered_workqueue - allocate an ordered workqueue
399399 * @fmt: printf format for the name of the workqueue
400400 * @flags: WQ_* flags (only WQ_FREEZABLE and WQ_MEM_RECLAIM are meaningful)
401− * @args: args for @fmt
401+ * @args...: args for @fmt
402402 *
403403 * Allocate an ordered workqueue. An ordered workqueue executes at
404404 * most one work item at any given time in the queued order. They are
kernel/workqueue.c+1−1
@@ -2612,7 +2612,7 @@ void flush_workqueue(struct workqueue_struct *wq) · 2611 unmodified lines
26122612 out_unlock:
26132613 mutex_unlock(&wq->mutex);
26142614 }
2615−EXPORT_SYMBOL_GPL(flush_workqueue);
2615+EXPORT_SYMBOL(flush_workqueue);
26162616
26172617 /**
26182618 * drain_workqueue - drain a workqueue