diff --git a/[refs] b/[refs]
index 5e6b0b62f39b..ccb92941cc76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4c6c34a530b4d1c626f4ac0a884e0a9b849378c
+refs/heads/master: 83df8db9e62129975fab6d800fb381faf0dfee74
diff --git a/trunk/include/asm-x86_64/smp.h b/trunk/include/asm-x86_64/smp.h
index d6b7c057edba..f1bdd500d7ac 100644
--- a/trunk/include/asm-x86_64/smp.h
+++ b/trunk/include/asm-x86_64/smp.h
@@ -118,13 +118,6 @@ static __inline int logical_smp_processor_id(void)
 #define cpu_physical_id(cpu)		x86_cpu_to_apicid[cpu]
 #else
 #define cpu_physical_id(cpu)		boot_cpu_id
-static inline int smp_call_function_single(int cpuid, void (*func) (void *info),
-				void *info, int retry, int wait)
-{
-	/* Disable interrupts here? */
-	func(info);
-	return 0;
-}
 #endif /* !CONFIG_SMP */
 #endif
 
diff --git a/trunk/include/linux/smp.h b/trunk/include/linux/smp.h
index 51649987f691..7ba23ec8211b 100644
--- a/trunk/include/linux/smp.h
+++ b/trunk/include/linux/smp.h
@@ -99,6 +99,13 @@ static inline int up_smp_call_function(void)
 static inline void smp_send_reschedule(int cpu) { }
 #define num_booting_cpus()			1
 #define smp_prepare_boot_cpu()			do {} while (0)
+static inline int smp_call_function_single(int cpuid, void (*func) (void *info),
+				void *info, int retry, int wait)
+{
+	/* Disable interrupts here? */
+	func(info);
+	return 0;
+}
 
 #endif /* !SMP */