diff options
author | Linus Torvalds | 2015-09-02 08:02:20 -0700 |
---|---|---|
committer | Linus Torvalds | 2015-09-02 08:02:20 -0700 |
commit | 7d3e2eb1786fafa186eb8bc276edef75ba69e023 (patch) | |
tree | e3fb1d4f891a45737045463b45e54f11cd29da47 /kernel | |
parent | 2dc7e555e33e645df70a8aa89c529de1902f0064 (diff) | |
parent | 355c06633e233a57155b827ebe99b91c35bc1f5c (diff) |
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
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/workqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 811edb77dd6d..ca71582fcfab 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -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 |