diff options
| author | Chris Zankel <[email protected]> | 2014-04-09 14:49:29 -0700 |
|---|---|---|
| committer | Chris Zankel <[email protected]> | 2014-04-09 14:49:29 -0700 |
| commit | e86c4b67feb2c984314eef71314f26cfe39fef36 (patch) | |
| tree | 3c5a7e2216cdcd1d06b8729bf94eba6dc74a7959 /include/linux/workqueue.h | |
| parent | b3fdfc1b4b641d372e35ced98814289bc60bc5d1 (diff) | |
| parent | 9c602629e34bad88a464e08de08118e80beee0d8 (diff) | |
Merge tag 'xtensa-for-next-20140406' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Merging from Max' tree.
Xtensa fixes for 3.15:
- add missing cache manipulation symbol exports to fix build failures;
- sort extable at build time;
- clean up sysmem code, support memmap boot parameter;
- add highmem support for cores with non-aliasing caches;
- add DTS for xtfpga on KC705.
Signed-off-by: Chris Zankel <[email protected]>
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); \ |