diff --git a/[refs] b/[refs]
index 65be675d8bec..6e5126d8a510 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9797cae3bfd2d7190609cdce05248cabc5d9081e
+refs/heads/master: 4679258d52f6d4aeeafd5c77203d97ddf48e2db0
diff --git a/trunk/include/asm-mips/smp.h b/trunk/include/asm-mips/smp.h
index 1608fd71d6f7..13aef6af422c 100644
--- a/trunk/include/asm-mips/smp.h
+++ b/trunk/include/asm-mips/smp.h
@@ -49,13 +49,6 @@ extern struct call_data_struct *call_data;
 extern cpumask_t phys_cpu_present_map;
 #define cpu_possible_map	phys_cpu_present_map
 
-extern cpumask_t cpu_callout_map;
-/* We don't mark CPUs online until __cpu_up(), so we need another measure */
-static inline int num_booting_cpus(void)
-{
-	return cpus_weight(cpu_callout_map);
-}
-
 /*
  * These are defined by the board-specific code.
  */