[GIT PULL] workqueue changes for v4.11-rc1

[GIT PULL] workqueue changes for v4.11-rc1

[Tejun Heo]

Hello,

Just one patch to silence clang's warnings.

Thanks.

The following changes since commit 6d04dfc8966019b8b0977b2cb942351f13d2b178:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2017-02-01 11:52:27 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-4.11

for you to fetch changes up to a45463cbf3f9dcdae683033c256f50bded513d6a:

  workqueue: avoid clang warning (2017-02-02 15:22:18 -0500)

----------------------------------------------------------------
Arnd Bergmann (1):
      workqueue: avoid clang warning

 include/linux/workqueue.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index a26cc437..bde063c 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;


-- 
tejun