Merge tag 'v4.4.42' into linux-linaro-lsk-v4.4

[firefly-linux-kernel-4.4.55.git] / kernel / cpu.c

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 85ff5e26e23b45b34201120c758082599f995b7e..40d20bf5de28390b46d3489bf361b61fa56c0305 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -223,12 +223,6 @@ static int cpu_notify(unsigned long val, void *v)
        return __cpu_notify(val, v, -1, NULL);
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
-
-static void cpu_notify_nofail(unsigned long val, void *v)
-{
-       BUG_ON(cpu_notify(val, v));
-}
 EXPORT_SYMBOL(register_cpu_notifier);
 EXPORT_SYMBOL(__register_cpu_notifier);
 
@@ -246,6 +240,12 @@ void __unregister_cpu_notifier(struct notifier_block *nb)
 }
 EXPORT_SYMBOL(__unregister_cpu_notifier);
 
+#ifdef CONFIG_HOTPLUG_CPU
+static void cpu_notify_nofail(unsigned long val, void *v)
+{
+       BUG_ON(cpu_notify(val, v));
+}
+
 /**
  * clear_tasks_mm_cpumask - Safely clear tasks' mm_cpumask for a CPU
  * @cpu: a CPU id