Merge branch 'x86-bsp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / kernel / cpu.c

diff --git a/kernel/cpu.c b/kernel/cpu.c
index f45657f1eb8ee3bb2ae084f5ebc4f22d80675eba..3046a503242c8eb67f031d445713a9e55c986e73 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -603,6 +603,11 @@ cpu_hotplug_pm_callback(struct notifier_block *nb,
 
 static int __init cpu_hotplug_pm_sync_init(void)
 {
+       /*
+        * cpu_hotplug_pm_callback has higher priority than x86
+        * bsp_pm_callback which depends on cpu_hotplug_pm_callback
+        * to disable cpu hotplug to avoid cpu hotplug race.
+        */
        pm_notifier(cpu_hotplug_pm_callback, 0);
        return 0;
 }