diff --git a/[refs] b/[refs]
index b69bdca50e2b..e9b16522350e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2e2400bd4faee24d11872134b7ae5bd363749c0
+refs/heads/master: 00b9b0af5887fed54e899e3b7f5c2ccf5e739def
diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c
index 63e8de13c948..3097382eb44a 100644
--- a/trunk/kernel/cpu.c
+++ b/trunk/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)