diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-02-24 22:21:29 -0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-24 22:21:29 -0800 |
| commit | 10b7cdc0084c27a312e59e80420c6aac70c64753 (patch) | |
| tree | ee891d6236bcd8dc988624839760aaa1846cf906 /include/linux/workqueue.h | |
| parent | 00efcb1c8e1c3c5e5d3ce6f0682d66402911a84f (diff) | |
| parent | 60480994c70981d0336aadb3f46b052977d3d19f (diff) | |
Merge branch 'clocks/fixes/drivers' of git://linuxtv.org/pinchartl/fbdev into clk-fixes
Diffstat (limited to 'include/linux/workqueue.h')
| -rw-r--r-- | include/linux/workqueue.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 594521ba0d43..704f4f652d0a 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); \ |