Messages in this thread Patch in this message |  | | | Date | Fri, 10 Dec 2010 17:41:08 +0100 | | From | Tejun Heo <> | | Subject | [GIT PULL] workqueue for v2.6.37-rc4 |
| |
Hello, Linus.
Please pull from the following branch to receive workqueue changes for v2.6.37-rc4.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-linus
It contains only two uninteresting changes. One to add a missing sanity check during system boot and the other to add MAINTAINERS entry.
Thanks. --- Hitoshi Mitake (1): workqueue: check the allocation of system_unbound_wq Tejun Heo (1): MAINTAINERS: Add workqueue entry
MAINTAINERS | 8 ++++++++ kernel/workqueue.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index b3be8b3..350dcf6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6585,6 +6585,14 @@ F: include/linux/mfd/wm8400* F: include/sound/wm????.h F: sound/soc/codecs/wm*
+WORKQUEUE +M: Tejun Heo <tj@kernel.org> +L: linux-kernel@vger.kernel.org +S: Maintained +F: include/linux/workqueue.h +F: kernel/workqueue.c +F: Documentation/workqueue.txt + X.25 NETWORK LAYER M: Andrew Hendry <andrew.hendry@gmail.com> L: linux-x25@vger.kernel.org diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 90db1bd..ca017ce 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -3692,7 +3692,8 @@ static int __init init_workqueues(void) system_nrt_wq = alloc_workqueue("events_nrt", WQ_NON_REENTRANT, 0); system_unbound_wq = alloc_workqueue("events_unbound", WQ_UNBOUND, WQ_UNBOUND_MAX_ACTIVE); - BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq); + BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq || + !system_unbound_wq); return 0; } early_initcall(init_workqueues);
|  |