diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-03-19 23:29:00 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-03-19 23:29:00 +0100 |
| commit | 96b165e5470cb58e747c257dadc44e427274fa83 (patch) | |
| tree | 72d7b8f92428ae4000f05755aecdf73944e1879c /kernel | |
| parent | bd21819a35cd50e552ee2bfc240f76fc2eaab2ee (diff) | |
| parent | 9bf176a3e029ae7f2dc6feae185091525a988be2 (diff) | |
| download | kernel_samsung_crespo-96b165e5470cb58e747c257dadc44e427274fa83.zip kernel_samsung_crespo-96b165e5470cb58e747c257dadc44e427274fa83.tar.gz kernel_samsung_crespo-96b165e5470cb58e747c257dadc44e427274fa83.tar.bz2 | |
Merge branch 'linux-3.0.y' into cm.ics
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/workqueue.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index aec02b6..1456dab 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -252,11 +252,13 @@ struct workqueue_struct *system_long_wq __read_mostly; struct workqueue_struct *system_nrt_wq __read_mostly; struct workqueue_struct *system_unbound_wq __read_mostly; struct workqueue_struct *system_freezable_wq __read_mostly; +struct workqueue_struct *system_nrt_freezable_wq __read_mostly; EXPORT_SYMBOL_GPL(system_wq); EXPORT_SYMBOL_GPL(system_long_wq); EXPORT_SYMBOL_GPL(system_nrt_wq); EXPORT_SYMBOL_GPL(system_unbound_wq); EXPORT_SYMBOL_GPL(system_freezable_wq); +EXPORT_SYMBOL_GPL(system_nrt_freezable_wq); #define CREATE_TRACE_POINTS #include <trace/events/workqueue.h> @@ -3796,8 +3798,11 @@ static int __init init_workqueues(void) WQ_UNBOUND_MAX_ACTIVE); system_freezable_wq = alloc_workqueue("events_freezable", WQ_FREEZABLE, 0); + system_nrt_freezable_wq = alloc_workqueue("events_nrt_freezable", + WQ_NON_REENTRANT | WQ_FREEZABLE, 0); BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq || - !system_unbound_wq || !system_freezable_wq); + !system_unbound_wq || !system_freezable_wq || + !system_nrt_freezable_wq); return 0; } early_initcall(init_workqueues); |