summaryrefslogtreecommitdiff
path: root/include/linux/workqueue.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-03-07 19:20:20 +0400
committerTejun Heo <tj@kernel.org>2014-03-07 19:20:20 +0400
commit7104ce9b349e0b0c9a71ee25efeb007057029677 (patch)
tree9b08a41c9c696c5a6bd80bf72a8b8bbb16ad8e15 /include/linux/workqueue.h
parent90d88bd75424dff51e2072fd2f8fa85ee893aa17 (diff)
parent70044d71d31d6973665ced5be04ef39ac1c09a48 (diff)
downloadlinux-7104ce9b349e0b0c9a71ee25efeb007057029677.tar.xz
Merge branch 'wq/for-3.14-fixes' into wq/for-3.15
To receive 70044d71d31d ("firewire: don't use PREPARE_DELAYED_WORK"). There will be further related updates in for-3.15 branch. Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/workqueue.h')
-rw-r--r--include/linux/workqueue.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index edc941049d79..8059334a6b02 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -419,10 +419,7 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active,
static struct lock_class_key __key; \
const char *__lock_name; \
\
- if (__builtin_constant_p(fmt)) \
- __lock_name = (fmt); \
- else \
- __lock_name = #fmt; \
+ __lock_name = #fmt#args; \
\
__alloc_workqueue_key((fmt), (flags), (max_active), \
&__key, __lock_name, ##args); \