diff --git a/[refs] b/[refs]
index 7dcdde37df12..873fe7d9f594 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cd5283b897f56004631944dd2888e9a7b843f89
+refs/heads/master: 6978c7052f2e22c6c40781cdd4eba5c4bce9a789
diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c
index e882c6babf41..8be22bd80933 100644
--- a/trunk/kernel/cpu.c
+++ b/trunk/kernel/cpu.c
@@ -223,8 +223,7 @@ int __devinit cpu_up(unsigned int cpu)
 	ret = __cpu_up(cpu);
 	if (ret != 0)
 		goto out_notify;
-	if (!cpu_online(cpu))
-		BUG();
+	BUG_ON(!cpu_online(cpu));
 
 	/* Now call notifier in preparation. */
 	notifier_call_chain(&cpu_chain, CPU_ONLINE, hcpu);