Merge remote-tracking branch 'regmap/for-next'

[karo-tx-linux.git] / include / linux / workqueue.h

diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index a0ed78ab54d74b3f60450745fd98c5bf1491e12c..594521ba0d43f73e887375968006429c9ec19502 100644 (file)
--- 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 */