Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24d51add authored by Tejun Heo's avatar Tejun Heo
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 43d133c1

include/linux/workqueue.h

+3 −3
Original line number Diff line number Diff line
@@ -287,14 +287,14 @@ enum { 
 * executed immediately as long as max_active limit is not reached and

 * resources are available.

 *

 * system_freezeable_wq is equivalent to system_wq except that it's

 * freezeable.

 * 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_freezeable_wq;

extern struct workqueue_struct *system_freezable_wq;



extern struct workqueue_struct *

__alloc_workqueue_key(const char *name, unsigned int flags, int max_active,

kernel/workqueue.c

+5 −5
Original line number Diff line number Diff line
@@ -251,12 +251,12 @@ struct workqueue_struct *system_wq __read_mostly; 
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_freezeable_wq __read_mostly;

struct workqueue_struct *system_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_freezeable_wq);

EXPORT_SYMBOL_GPL(system_freezable_wq);



#define CREATE_TRACE_POINTS

#include <trace/events/workqueue.h>
@@ -3777,10 +3777,10 @@ 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);

	system_freezeable_wq = alloc_workqueue("events_freezeable",

					       WQ_FREEZEABLE, 0);

	system_freezable_wq = alloc_workqueue("events_freezable",

					      WQ_FREEZABLE, 0);

	BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq ||

	       !system_unbound_wq || !system_freezeable_wq);

	       !system_unbound_wq || !system_freezable_wq);

	return 0;

}

early_initcall(init_workqueues);