diff --git a/[refs] b/[refs]
index 2245be2a2618..bb36079ba6e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf2049f983eb47f9463d3dd54abd82e3e58846f9
+refs/heads/master: 43117a08280e40be43e181c51cce296ef4b4c7e5
diff --git a/trunk/kernel/power/smp.c b/trunk/kernel/power/smp.c
index 7fa7f6e2b7fb..cba3584b80fe 100644
--- a/trunk/kernel/power/smp.c
+++ b/trunk/kernel/power/smp.c
@@ -46,13 +46,13 @@ static cpumask_t oldmask;
 
 void disable_nonboot_cpus(void)
 {
-	printk("Freezing CPUs (at %d)", smp_processor_id());
 	oldmask = current->cpus_allowed;
 	set_cpus_allowed(current, cpumask_of_cpu(0));
+	printk("Freezing CPUs (at %d)", _smp_processor_id());
 	current->state = TASK_INTERRUPTIBLE;
 	schedule_timeout(HZ);
 	printk("...");
-	BUG_ON(smp_processor_id() != 0);
+	BUG_ON(_smp_processor_id() != 0);
 
 	/* FIXME: for this to work, all the CPUs must be running
 	 * "idle" thread (or we deadlock). Is that guaranteed? */