diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-09-19 18:46:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-09-19 18:46:43 +0200 |
| commit | 43cdd088b1b10306d4eb6d9208b62c7f60abffeb (patch) | |
| tree | 8dd799379a241c1b47b736299c306eb77f06e6ff /include/linux/workqueue.h | |
| parent | bf69aa906ccddacc9e966794869431374953738a (diff) | |
| parent | 4028b6c4c03f213260e9290ff3a6b5439aad07ce (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/linux/workqueue.h')
| -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 a0ed78ab54d7..594521ba0d43 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 */ |