Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em'

[linux-2.6-microblaze.git] / include / linux / workqueue.h

diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index d15a773..2ebef6b 100644 (file)
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -29,7 +29,7 @@ void delayed_work_timer_fn(struct timer_list *t);
 
 enum {
        WORK_STRUCT_PENDING_BIT = 0,    /* work item is pending execution */
-       WORK_STRUCT_DELAYED_BIT = 1,    /* work item is delayed */
+       WORK_STRUCT_INACTIVE_BIT= 1,    /* work item is inactive */
        WORK_STRUCT_PWQ_BIT     = 2,    /* data points to pwq */
        WORK_STRUCT_LINKED_BIT  = 3,    /* next work is linked to this one */
 #ifdef CONFIG_DEBUG_OBJECTS_WORK
@@ -42,7 +42,7 @@ enum {
        WORK_STRUCT_COLOR_BITS  = 4,
 
        WORK_STRUCT_PENDING     = 1 << WORK_STRUCT_PENDING_BIT,
-       WORK_STRUCT_DELAYED     = 1 << WORK_STRUCT_DELAYED_BIT,
+       WORK_STRUCT_INACTIVE    = 1 << WORK_STRUCT_INACTIVE_BIT,
        WORK_STRUCT_PWQ         = 1 << WORK_STRUCT_PWQ_BIT,
        WORK_STRUCT_LINKED      = 1 << WORK_STRUCT_LINKED_BIT,
 #ifdef CONFIG_DEBUG_OBJECTS_WORK
@@ -51,19 +51,14 @@ enum {
        WORK_STRUCT_STATIC      = 0,
 #endif
 
-       /*
-        * The last color is no color used for works which don't
-        * participate in workqueue flushing.
-        */
-       WORK_NR_COLORS          = (1 << WORK_STRUCT_COLOR_BITS) - 1,
-       WORK_NO_COLOR           = WORK_NR_COLORS,
+       WORK_NR_COLORS          = (1 << WORK_STRUCT_COLOR_BITS),
 
        /* not bound to any CPU, prefer the local CPU */
        WORK_CPU_UNBOUND        = NR_CPUS,
 
        /*
         * Reserve 8 bits off of pwq pointer w/ debugobjects turned off.
-        * This makes pwqs aligned to 256 bytes and allows 15 workqueue
+        * This makes pwqs aligned to 256 bytes and allows 16 workqueue
         * flush colors.
         */
        WORK_STRUCT_FLAG_BITS   = WORK_STRUCT_COLOR_SHIFT +
@@ -324,7 +319,7 @@ enum {
         * to execute and tries to keep idle cores idle to conserve power;
         * however, for example, a per-cpu work item scheduled from an
         * interrupt handler on an idle CPU will force the scheduler to
-        * excute the work item on that CPU breaking the idleness, which in
+        * execute the work item on that CPU breaking the idleness, which in
         * turn may lead to more scheduling choices which are sub-optimal
         * in terms of power consumption.
         *