diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-10-17 05:38:15 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-17 05:38:14 -0700 |
| commit | f2b5c20a20626247665b913b6ec6cb37de0bfa89 (patch) | |
| tree | 3e214059d460cbd3861557c3b43a567d49632785 /include/linux/workqueue.h | |
| parent | 6d08baec3167417c0950132dc231a7ae8e2bc283 (diff) | |
| parent | fda1654df897b537f5d33bda92ef7435b68c606f (diff) | |
Merge "Merge android-4.4@d68ba9f (v4.4.89) into msm-4.4"
Diffstat (limited to 'include/linux/workqueue.h')
| -rw-r--r-- | include/linux/workqueue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 2e04fa5a5b58..4e4aee64f559 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -311,7 +311,7 @@ enum { __WQ_DRAINING = 1 << 16, /* internal: workqueue is draining */ __WQ_ORDERED = 1 << 17, /* internal: workqueue is ordered */ - __WQ_ORDERED_EXPLICIT = 1 << 18, /* internal: alloc_ordered_workqueue() */ + __WQ_ORDERED_EXPLICIT = 1 << 19, /* internal: alloc_ordered_workqueue() */ WQ_MAX_ACTIVE = 512, /* I like 512, better ideas? */ WQ_MAX_UNBOUND_PER_CPU = 4, /* 4 * #cpus for unbound wq */ |