summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-03-01 16:43:31 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2011-03-01 16:43:31 +1100
commitf0cf56de34a813b19b7f81c953275b24c8e48366 (patch)
tree57a6a7bad5020c209dcbf3ab52e5ffc562a2fe60 /include
parentf84cbf9bf91974f6098c4e1c2b293462a2b8797d (diff)
parent24d51add7438f9696a7205927bf9de3c5c787a58 (diff)
Merge remote-tracking branch 'workqueues/for-next'
Diffstat (limited to 'include')
-rw-r--r--include/linux/workqueue.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index f7998a3bf020..f584aba78ca9 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -286,11 +286,15 @@ enum {
* any specific CPU, not concurrency managed, and all queued works are
* executed immediately as long as max_active limit is not reached and
* resources are available.
+ *
+ * system_freezable_wq is equivalent to system_wq except that it's
+ * freezable.
*/
extern struct workqueue_struct *system_wq;
extern struct workqueue_struct *system_long_wq;
extern struct workqueue_struct *system_nrt_wq;
extern struct workqueue_struct *system_unbound_wq;
+extern struct workqueue_struct *system_freezable_wq;
extern struct workqueue_struct *
__alloc_workqueue_key(const char *name, unsigned int flags, int max_active,