diff --git a/[refs] b/[refs]
index 4d83293c6b9f..2774936e1190 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a14d4c898285623d1f5c338b659fa82cf4480fb
+refs/heads/master: bba0e4670a4e1841a96b561dcc60ebe335049891
diff --git a/trunk/kernel/power/smp.c b/trunk/kernel/power/smp.c
index bbe23079c62c..911fc62b8225 100644
--- a/trunk/kernel/power/smp.c
+++ b/trunk/kernel/power/smp.c
@@ -38,7 +38,7 @@ void disable_nonboot_cpus(void)
 		}
 		printk("Error taking cpu %d down: %d\n", cpu, error);
 	}
-	BUG_ON(smp_processor_id() != 0);
+	BUG_ON(raw_smp_processor_id() != 0);
 	if (error)
 		panic("cpus not sleeping");
 }