diff --git a/[refs] b/[refs]
index ecb0acfb4bae..88e9ee26e3c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6feb6efaec9858dfb673fc5c89b8280b1b73bb08
+refs/heads/master: f7a849153be3b66326b52dce0d07896b56cb4cd7
diff --git a/trunk/include/asm-mips/fixmap.h b/trunk/include/asm-mips/fixmap.h
index 1cadefbbc037..6959bdb59310 100644
--- a/trunk/include/asm-mips/fixmap.h
+++ b/trunk/include/asm-mips/fixmap.h
@@ -69,7 +69,11 @@ extern void __set_fixmap (enum fixed_addresses idx,
  * the start of the fixmap, and leave one page empty
  * at the top of mem..
  */
+#if defined(CONFIG_CPU_TX39XX) || defined(CONFIG_CPU_TX49XX)
+#define FIXADDR_TOP	(0xff000000UL - 0x2000)
+#else
 #define FIXADDR_TOP	(0xffffe000UL)
+#endif
 #define FIXADDR_SIZE	(__end_of_fixed_addresses << PAGE_SHIFT)
 #define FIXADDR_START	(FIXADDR_TOP - FIXADDR_SIZE)