Browse Source

Revert "sh: Ensure fixmap and store queue space can co-exist."

This reverts commit 20e7c297efeca0861adcca073a0d283da659834b.
With store queues enabled the area above P4SEG has special properties
from the MMU's point of view, which was causing fixmap failure. We'll
have to do something else to satisfy the vmalloc range check.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Paul Mundt 13 years ago
parent
commit
c3e0af9879
2 changed files with 3 additions and 3 deletions
  1. 1 1
      arch/sh/include/asm/fixmap.h
  2. 2 2
      arch/sh/mm/fault.c

+ 1 - 1
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

+ 2 - 2
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;
 
 	/*