diff --git a/[refs] b/[refs]
index ed0291f5fc5b..c108e794bf59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b7711f0839d12edac3abfc2f3e4c5bdc660878b
+refs/heads/master: 92f98b19bcce8b56ec6fc067702e211c36f19e88
diff --git a/trunk/include/asm-x86/smp_64.h b/trunk/include/asm-x86/smp_64.h
index 6f0e0273b646..ab612b0ff270 100644
--- a/trunk/include/asm-x86/smp_64.h
+++ b/trunk/include/asm-x86/smp_64.h
@@ -76,6 +76,8 @@ extern unsigned __cpuinitdata disabled_cpus;
 
 #endif /* CONFIG_SMP */
 
+#define safe_smp_processor_id()		smp_processor_id()
+
 static inline int hard_smp_processor_id(void)
 {
 	/* we don't want to mark this access volatile - bad code generation */