diff --git a/[refs] b/[refs]
index 438ad0992e2a..788cefcccc40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bf79539ed0866f1f67d09e807e745eae9588adb
+refs/heads/master: 78759757dff4ba9a2564daad1fc8e7f051080cd1
diff --git a/trunk/include/asm-cris/smp.h b/trunk/include/asm-cris/smp.h
index dca5ef1d8c97..dba33aba3e95 100644
--- a/trunk/include/asm-cris/smp.h
+++ b/trunk/include/asm-cris/smp.h
@@ -4,8 +4,8 @@
 #include <linux/cpumask.h>
 
 extern cpumask_t phys_cpu_present_map;
-#define cpu_possible_map phys_cpu_present_map
+extern cpumask_t cpu_possible_map;
 
-#define __smp_processor_id() (current_thread_info()->cpu)
+#define raw_smp_processor_id() (current_thread_info()->cpu)
 
 #endif