1 files changed, 3 insertions, 6 deletions

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 63e8de13c948..3097382eb44a 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -154,16 +154,13 @@ 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)
 {
-        int err;
-
-        err = cpu_notify(val, v);
-        BUG_ON(err);
+        BUG_ON(cpu_notify(val, v));
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
-
 EXPORT_SYMBOL(register_cpu_notifier);
 
 void __ref unregister_cpu_notifier(struct notifier_block *nb)