From: Tejun Heo <tj@kernel•org>
To: Dmitry Torokhov <dmitry.torokhov@gmail•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: [PATCH wq#for-2.6.39] workqueue: fix build failure introduced by s/freezeable/freezable/
Date: Mon, 21 Feb 2011 10:03:54 +0100 [thread overview]
Message-ID: <20110221090354.GE31267@htj.dyndns.org> (raw)
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>
---
I pulled mainline into wq#for-2.6.39 and applied the build fix.
#for-next updated accordingly. Dmitry, please feel free to pull in
the following branch for system_wq_freezable. The branch is stable.
HEAD is 6c9e293a1f (workqueue: fix build failure introduced by
s/freezeable/freezable/).
git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-2.6.39
Thank you.
include/linux/workqueue.h | 6 +++---
kernel/workqueue.c | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index d110cc4..f584aba 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -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,
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 572f559..1b64d22 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -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);
--
1.7.1
next reply other threads:[~2011-02-21 9:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-21 9:03 Tejun Heo [this message]
2011-02-21 9:10 ` [PATCH wq#for-2.6.39] workqueue: fix build failure introduced by s/freezeable/freezable/ Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110221090354.GE31267@htj.dyndns.org \
--to=tj@kernel$(echo .)org \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox