diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 01:19:21 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 01:19:21 (GMT) |
| commit | 9ee52a1633a77961cb7b7fb5bd40be682f8412c7 (patch) | |
| tree | 2b45df88a77cca6eaeac414653a852c3905dd514 /include | |
| parent | 96d4e231d25e3d7d8b7a2a9267043eac5d4560a8 (diff) | |
| parent | 546d30c4a2e61a53d408e5f40d01278f144bb0f5 (diff) | |
| download | linux-fsl-qoriq-9ee52a1633a77961cb7b7fb5bd40be682f8412c7.tar.xz | |
Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue updates from Tejun Heo:
"Nothing interesting. All are doc / comment updates"
* 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: Correct/Drop references to gcwq in Documentation
workqueue: Fix manage_workers() RETURNS description
workqueue: Comment correction in file header
workqueue: mark WQ_NON_REENTRANT deprecated
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/workqueue.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index a0ed78a..594521b 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -295,7 +295,12 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } * Documentation/workqueue.txt. */ enum { - WQ_NON_REENTRANT = 1 << 0, /* guarantee non-reentrance */ + /* + * All wqs are now non-reentrant making the following flag + * meaningless. Will be removed. + */ + WQ_NON_REENTRANT = 1 << 0, /* DEPRECATED */ + WQ_UNBOUND = 1 << 1, /* not bound to any cpu */ WQ_FREEZABLE = 1 << 2, /* freeze during suspend */ WQ_MEM_RECLAIM = 1 << 3, /* may be used for memory reclaim */ |