aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
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 /kernel
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 'kernel')
-rw-r--r--kernel/workqueue.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 572f559f6cb9..1b64d225f067 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -251,12 +251,12 @@ struct workqueue_struct *system_wq __read_mostly;
251struct workqueue_struct *system_long_wq __read_mostly; 251struct workqueue_struct *system_long_wq __read_mostly;
252struct workqueue_struct *system_nrt_wq __read_mostly; 252struct workqueue_struct *system_nrt_wq __read_mostly;
253struct workqueue_struct *system_unbound_wq __read_mostly; 253struct workqueue_struct *system_unbound_wq __read_mostly;
254struct workqueue_struct *system_freezeable_wq __read_mostly; 254struct workqueue_struct *system_freezable_wq __read_mostly;
255EXPORT_SYMBOL_GPL(system_wq); 255EXPORT_SYMBOL_GPL(system_wq);
256EXPORT_SYMBOL_GPL(system_long_wq); 256EXPORT_SYMBOL_GPL(system_long_wq);
257EXPORT_SYMBOL_GPL(system_nrt_wq); 257EXPORT_SYMBOL_GPL(system_nrt_wq);
258EXPORT_SYMBOL_GPL(system_unbound_wq); 258EXPORT_SYMBOL_GPL(system_unbound_wq);
259EXPORT_SYMBOL_GPL(system_freezeable_wq); 259EXPORT_SYMBOL_GPL(system_freezable_wq);
260 260
261#define CREATE_TRACE_POINTS 261#define CREATE_TRACE_POINTS
262#include <trace/events/workqueue.h> 262#include <trace/events/workqueue.h>
@@ -3777,10 +3777,10 @@ static int __init init_workqueues(void)
3777 system_nrt_wq = alloc_workqueue("events_nrt", WQ_NON_REENTRANT, 0); 3777 system_nrt_wq = alloc_workqueue("events_nrt", WQ_NON_REENTRANT, 0);
3778 system_unbound_wq = alloc_workqueue("events_unbound", WQ_UNBOUND, 3778 system_unbound_wq = alloc_workqueue("events_unbound", WQ_UNBOUND,
3779 WQ_UNBOUND_MAX_ACTIVE); 3779 WQ_UNBOUND_MAX_ACTIVE);
3780 system_freezeable_wq = alloc_workqueue("events_freezeable", 3780 system_freezable_wq = alloc_workqueue("events_freezable",
3781 WQ_FREEZEABLE, 0); 3781 WQ_FREEZABLE, 0);
3782 BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq || 3782 BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq ||
3783 !system_unbound_wq || !system_freezeable_wq); 3783 !system_unbound_wq || !system_freezable_wq);
3784 return 0; 3784 return 0;
3785} 3785}
3786early_initcall(init_workqueues); 3786early_initcall(init_workqueues);