aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-02-21 03:52:50 -0500
committerTejun Heo <tj@kernel.org>2011-02-21 04:07:23 -0500
commit24d51add7438f9696a7205927bf9de3c5c787a58 (patch)
tree133c4470edc09e70de6bc5b7910d43745801f469 /include/linux
parent43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 (diff)
workqueue: fix build failure introduced by s/freezeable/freezable/
wq:fixes-2.6.38 does s/WQ_FREEZEABLE/WQ_FREEZABLE and wq:for-2.6.39 adds new usage of the flag. The combination of the two creates a build failure after merge. Fix it by renaming all freezeables to freezables. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/workqueue.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index d110cc4f9fed..f584aba78ca9 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -287,14 +287,14 @@ enum {
287 * executed immediately as long as max_active limit is not reached and 287 * executed immediately as long as max_active limit is not reached and
288 * resources are available. 288 * resources are available.
289 * 289 *
290 * system_freezeable_wq is equivalent to system_wq except that it's 290 * system_freezable_wq is equivalent to system_wq except that it's
291 * freezeable. 291 * freezable.
292 */ 292 */
293extern struct workqueue_struct *system_wq; 293extern struct workqueue_struct *system_wq;
294extern struct workqueue_struct *system_long_wq; 294extern struct workqueue_struct *system_long_wq;
295extern struct workqueue_struct *system_nrt_wq; 295extern struct workqueue_struct *system_nrt_wq;
296extern struct workqueue_struct *system_unbound_wq; 296extern struct workqueue_struct *system_unbound_wq;
297extern struct workqueue_struct *system_freezeable_wq; 297extern struct workqueue_struct *system_freezable_wq;
298 298
299extern struct workqueue_struct * 299extern struct workqueue_struct *
300__alloc_workqueue_key(const char *name, unsigned int flags, int max_active, 300__alloc_workqueue_key(const char *name, unsigned int flags, int max_active,