diff --git a/[refs] b/[refs]
index bdd85171413f..64139330df09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db813fe5a77d03b29e872da47463d2efbddc3fc2
+refs/heads/master: f4fae8267c152d6c319a7bfaf92ed1c2c9a2c4e8
diff --git a/trunk/include/asm-mips/page.h b/trunk/include/asm-mips/page.h
index c90fe560a0d9..e3301e54d559 100644
--- a/trunk/include/asm-mips/page.h
+++ b/trunk/include/asm-mips/page.h
@@ -142,7 +142,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 /*
  * __pa()/__va() should be used only during mem init.
  */
-#ifdef KBUILD_64BIT_SYM32
+#ifdef CONFIG_64BIT
 #define __pa(x)								\
 ({									\
     unsigned long __x = (unsigned long)(x);				\