diff --git a/[refs] b/[refs]
index 0e9cb663e1dc..6f51291bab73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a7b7739f9dba4014fc93531e4c2b6efac41b0a7
+refs/heads/master: 20e7c297efeca0861adcca073a0d283da659834b
diff --git a/trunk/arch/sh/include/asm/fixmap.h b/trunk/arch/sh/include/asm/fixmap.h
index bd7e79a12653..5f1ca55bcec8 100644
--- a/trunk/arch/sh/include/asm/fixmap.h
+++ b/trunk/arch/sh/include/asm/fixmap.h
@@ -94,7 +94,7 @@ extern void __clear_fixmap(enum fixed_addresses idx, pgprot_t flags);
  * at the top of mem..
  */
 #ifdef CONFIG_SUPERH32
-#define FIXADDR_TOP	(P4SEG - PAGE_SIZE)
+#define FIXADDR_TOP	(P3_ADDR_MAX - PAGE_SIZE)
 #else
 #define FIXADDR_TOP	(0xff000000 - PAGE_SIZE)
 #endif
diff --git a/trunk/arch/sh/mm/fault_32.c b/trunk/arch/sh/mm/fault_32.c
index a469b95e88fb..39e291c6b352 100644
--- a/trunk/arch/sh/mm/fault_32.c
+++ b/trunk/arch/sh/mm/fault_32.c
@@ -168,8 +168,8 @@ static noinline int vmalloc_fault(unsigned long address)
 	pmd_t *pmd_k;
 	pte_t *pte_k;
 
-	/* Make sure we are in vmalloc/module/P3 area: */
-	if (!(address >= P3SEG && address < P3_ADDR_MAX))
+	/* Make sure we are in vmalloc/module area: */
+	if (!is_vmalloc_addr((void *)address))
 		return -1;
 
 	/*