summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-27 22:12:20 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-27 22:12:20 -0800
commit12dfdfedbf8ce3b1464e2cea80014fa0a92ed3e2 (patch)
tree1619ad0c800de00353d1274c4f65385761d514c9
parentf7878dc3a9d3d900c86a66d9742f7e06681b06cd (diff)
parenta45463cbf3f9dcdae683033c256f50bded513d6a (diff)
downloadlinux-12dfdfedbf8ce3b1464e2cea80014fa0a92ed3e2.tar.bz2
Merge branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue update from Tejun Heo: "Just one patch to silence clang's warnings" * 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: avoid clang warning
-rw-r--r--include/linux/workqueue.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index a26cc437293c..bde063cefd04 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -106,9 +106,9 @@ struct work_struct {
#endif
};
-#define WORK_DATA_INIT() ATOMIC_LONG_INIT(WORK_STRUCT_NO_POOL)
+#define WORK_DATA_INIT() ATOMIC_LONG_INIT((unsigned long)WORK_STRUCT_NO_POOL)
#define WORK_DATA_STATIC_INIT() \
- ATOMIC_LONG_INIT(WORK_STRUCT_NO_POOL | WORK_STRUCT_STATIC)
+ ATOMIC_LONG_INIT((unsigned long)(WORK_STRUCT_NO_POOL | WORK_STRUCT_STATIC))
struct delayed_work {
struct work_struct work;