openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2015-09-02 08:02:20 -07:00
parent 2dc7e555e3 355c06633e
commit 7d3e2eb178
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -11244,6 +11244,7 @@ F: sound/soc/codecs/wm*
WORKQUEUE WORKQUEUE
M: Tejun Heo <tj@kernel.org> 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 T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
S: Maintained S: Maintained
F: include/linux/workqueue.h F: include/linux/workqueue.h

6
include/linux/workqueue.h
View File

@ -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 * delayed_work_pending - Find out whether a delayable work item is currently
* pending * pending
* @work: The work item in question * @w: The work item in question
*/ */
#define delayed_work_pending(w) \ #define delayed_work_pending(w) \
work_pending(&(w)->work) 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 * @fmt: printf format for the name of the workqueue
* @flags: WQ_* flags * @flags: WQ_* flags
* @max_active: max in-flight work items, 0 for default * @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 * Allocate a workqueue with the specified parameters. For detailed
* information on WQ_* flags, please refer to Documentation/workqueue.txt. * 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 * alloc_ordered_workqueue - allocate an ordered workqueue
* @fmt: printf format for the name of the workqueue * @fmt: printf format for the name of the workqueue
* @flags: WQ_* flags (only WQ_FREEZABLE and WQ_MEM_RECLAIM are meaningful) * @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 * Allocate an ordered workqueue. An ordered workqueue executes at
* most one work item at any given time in the queued order. They are * most one work item at any given time in the queued order. They are

2
kernel/workqueue.c
View File

@ -2612,7 +2612,7 @@ void flush_workqueue(struct workqueue_struct *wq)
out_unlock: out_unlock:
mutex_unlock(&wq->mutex); mutex_unlock(&wq->mutex);
} }
EXPORT_SYMBOL_GPL(flush_workqueue); EXPORT_SYMBOL(flush_workqueue);
/** /**
* drain_workqueue - drain a workqueue * drain_workqueue - drain a workqueue