Merge branch 'sched-wq' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq into sched/core

1 files changed, 25 insertions, 0 deletions

diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index e287863ac053..de6b1722cdca 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -48,6 +48,31 @@ extern ssize_t arch_cpu_release(const char *, size_t);
 #endif
 struct notifier_block;
 
+/*
+ * CPU notifier priorities.
+ */
+enum {
+        /*
+         * SCHED_ACTIVE marks a cpu which is coming up active during
+         * CPU_ONLINE and CPU_DOWN_FAILED and must be the first
+         * notifier.  CPUSET_ACTIVE adjusts cpuset according to
+         * cpu_active mask right after SCHED_ACTIVE.  During
+         * CPU_DOWN_PREPARE, SCHED_INACTIVE and CPUSET_INACTIVE are
+         * ordered in the similar way.
+         *
+         * This ordering guarantees consistent cpu_active mask and
+         * migration behavior to all cpu notifiers.
+         */
+        CPU_PRI_SCHED_ACTIVE    = INT_MAX,
+        CPU_PRI_CPUSET_ACTIVE   = INT_MAX - 1,
+        CPU_PRI_SCHED_INACTIVE  = INT_MIN + 1,
+        CPU_PRI_CPUSET_INACTIVE = INT_MIN,
+
+        /* migration should happen before other stuff but after perf */
+        CPU_PRI_PERF            = 20,
+        CPU_PRI_MIGRATION       = 10,
+};
+
 #ifdef CONFIG_SMP
 /* Need to know about CPUs going up/down? */
 #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE)