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

Showing the changes to kernel/workqueue.c (1 of 3 files). Show all

Unified · Split

kernel/workqueue.c+1−1
@@ -2612,7 +2612,7 @@ void flush_workqueue(struct workqueue_struct *wq) · 2611 unmodified lines
2612out_unlock:2612out_unlock:
2613 mutex_unlock(&wq->mutex);2613 mutex_unlock(&wq->mutex);
2614}2614}
2615EXPORT_SYMBOL_GPL(flush_workqueue);2615EXPORT_SYMBOL(flush_workqueue);
2616 2616
2617/**2617/**
2618 * drain_workqueue - drain a workqueue2618 * drain_workqueue - drain a workqueue