diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 13:28:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 13:28:26 +1100 |
| commit | a0acfdf96b1452ed93ee6587613f376234437b2e (patch) | |
| tree | d7a75fb1ebf35d5b40045acf6e182242b468a7c7 | |
| parent | c2e4cc9aaeb5d8e9fd6b686ecfc8f1b88fcd9123 (diff) | |
| parent | a45463cbf3f9dcdae683033c256f50bded513d6a (diff) | |
Merge remote-tracking branch 'workqueues/for-next'
| -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; |