From a2839af527aad58b742c2eb2242a14f74e19c92f Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 May 2010 10:32:08 -0700
Subject: [PATCH] --- yaml --- r: 198989 b: refs/heads/master c:
 00b9b0af5887fed54e899e3b7f5c2ccf5e739def h: refs/heads/master i:   198987:
 8be475bcba279eb6095c86ffd8aee9eaeb720e6b v: v3

---
 [refs]             | 2 +-
 trunk/kernel/cpu.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

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)