3 files changed, 11 insertions, 2 deletions

diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index e287863ac05..2d9073883ea 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -48,6 +48,15 @@ extern ssize_t arch_cpu_release(const char *, size_t);
 #endif
 struct notifier_block;
 
+/*
+ * CPU notifier priorities.
+ */
+enum {
+        /* 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)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 5d0266d9498..469e03e96fe 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -1068,7 +1068,7 @@ static inline void perf_event_disable(struct perf_event *event)		{ }
 #define perf_cpu_notifier(fn)                                   \
 do {                                                            \
         static struct notifier_block fn##_nb __cpuinitdata =    \
-                { .notifier_call = fn, .priority = 20 };        \
+                { .notifier_call = fn, .priority = CPU_PRI_PERF }; \
         fn(&fn##_nb, (unsigned long)CPU_UP_PREPARE,             \
                 (void *)(unsigned long)smp_processor_id());     \
         fn(&fn##_nb, (unsigned long)CPU_STARTING,               \
diff --git a/kernel/sched.c b/kernel/sched.c
index f8b8996228d..552faf8d358 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5801,7 +5801,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
  */
 static struct notifier_block __cpuinitdata migration_notifier = {
         .notifier_call = migration_call,
-        .priority = 10
+        .priority = CPU_PRI_MIGRATION,
 };
 
 static int __init migration_init(void)