Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d3e2eb1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2dc7e555 355c0663

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -11244,6 +11244,7 @@ F: sound/soc/codecs/wm* 


WORKQUEUE

M:	Tejun Heo <tj@kernel.org>

R:	Lai Jiangshan <jiangshanlai@gmail.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git

S:	Maintained

F:	include/linux/workqueue.h

include/linux/workqueue.h

+3 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } 
/**

 * delayed_work_pending - Find out whether a delayable work item is currently

 * pending

 * @work: The work item in question

 * @w: The work item in question

 */

#define delayed_work_pending(w) \

	work_pending(&(w)->work)
@@ -366,7 +366,7 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active, 
 * @fmt: printf format for the name of the workqueue

 * @flags: WQ_* flags

 * @max_active: max in-flight work items, 0 for default

 * @args: args for @fmt

 * @args...: args for @fmt

 *

 * Allocate a workqueue with the specified parameters.  For detailed

 * 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, 
 * alloc_ordered_workqueue - allocate an ordered workqueue

 * @fmt: printf format for the name of the workqueue

 * @flags: WQ_* flags (only WQ_FREEZABLE and WQ_MEM_RECLAIM are meaningful)

 * @args: args for @fmt

 * @args...: args for @fmt

 *

 * Allocate an ordered workqueue.  An ordered workqueue executes at

 * most one work item at any given time in the queued order.  They are

kernel/workqueue.c

+1 −1
Original line number Diff line number Diff line
@@ -2612,7 +2612,7 @@ void flush_workqueue(struct workqueue_struct *wq) 
out_unlock:

	mutex_unlock(&wq->mutex);

}

EXPORT_SYMBOL_GPL(flush_workqueue);

EXPORT_SYMBOL(flush_workqueue);



/**

 * drain_workqueue - drain a workqueue