diff --git a/[refs] b/[refs]
index 2d8b88718f98..18cab52d01f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f4b6c1a94a8735bbdc030a2911cf395495645b6
+refs/heads/master: 915441b601e6662e79f6c958e7be307967a96977
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 2a7ce0f8e453..84d3732c0ce5 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -527,9 +527,9 @@ static void __init boot_cpu_init(void)
 {
 	int cpu = smp_processor_id();
 	/* Mark the boot cpu "present", "online" etc for SMP and UP case */
-	cpu_set(cpu, cpu_online_map);
-	cpu_set(cpu, cpu_present_map);
-	cpu_set(cpu, cpu_possible_map);
+	set_cpu_online(cpu, true);
+	set_cpu_present(cpu, true);
+	set_cpu_possible(cpu, true);
 }
 
 void __init __weak smp_setup_processor_id(void)