Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12dfdfed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f7878dc3 a45463cb

include/linux/workqueue.h

+2 −2
Original line number Diff line number Diff line
@@ -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;