diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-27 22:12:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-27 22:12:20 -0800 |
| commit | 12dfdfedbf8ce3b1464e2cea80014fa0a92ed3e2 (patch) | |
| tree | 1619ad0c800de00353d1274c4f65385761d514c9 | |
| parent | Merge branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup (diff) | |
| parent | workqueue: avoid clang warning (diff) | |
| download | linux-dev-12dfdfedbf8ce3b1464e2cea80014fa0a92ed3e2.tar.xz linux-dev-12dfdfedbf8ce3b1464e2cea80014fa0a92ed3e2.zip | |
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.h | 4 |
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; |