diff --git a/[refs] b/[refs]
index 68d8966e3b3c..52021f31e1b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36b2a8d5aff4cb3ee83d5e40447a8f073bcfe2fb
+refs/heads/master: d8cebe65ea5179e3293c38427d71f4d73c795d39
diff --git a/trunk/include/asm-x86_64/smp.h b/trunk/include/asm-x86_64/smp.h
index d6b7c057edba..7ae7e7d89d16 100644
--- a/trunk/include/asm-x86_64/smp.h
+++ b/trunk/include/asm-x86_64/smp.h
@@ -82,11 +82,6 @@ extern u8 x86_cpu_to_apicid[NR_CPUS];	/* physical ID */
 extern u8 x86_cpu_to_log_apicid[NR_CPUS];
 extern u8 bios_cpu_apicid[];
 
-static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
-{
-	return cpus_addr(cpumask)[0];
-}
-
 static inline int cpu_present_to_apicid(int mps_cpu)
 {
 	if (mps_cpu < NR_CPUS)