---

yaml --- r: 305297 b: refs/heads/master c: c3e0af9 h: refs/heads/master i: 305295: 3215732 v: v3
git-mirror · May 18, 2012 · 2252f15 · 2252f15
1 parent 0cb8d30
commit 2252f15
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e8963de1fe95e7fbc30c79c1dbc7cb1ea0cf699
+refs/heads/master: c3e0af98792f9f1c840dc969f883e46d0ced3e00
diff --git 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	(P3_ADDR_MAX - PAGE_SIZE)
+#define FIXADDR_TOP	(P4SEG - PAGE_SIZE)
 #else
 #define FIXADDR_TOP	((unsigned long)(-PAGE_SIZE))
 #endif

diff --git a/trunk/arch/sh/mm/fault.c b/trunk/arch/sh/mm/fault.c
@@ -169,8 +169,8 @@ static noinline int vmalloc_fault(unsigned long address)
 	pmd_t *pmd_k;
 	pte_t *pte_k;
 
-	/* Make sure we are in vmalloc/module area: */
-	if (!is_vmalloc_addr((void *)address))
+	/* Make sure we are in vmalloc/module/P3 area: */
+	if (!(address >= P3SEG && address < P3_ADDR_MAX))
 		return -1;
 
 	/*