summaryrefslogtreecommitdiffstats
path: root/arch/sh/mm
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-05-14 15:11:35 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-05-14 15:11:35 +0900
commit20e7c297efeca0861adcca073a0d283da659834b (patch)
treead92c21a2029b7fed58e2be880541231ebcd3b2a /arch/sh/mm
parent9a7b7739f9dba4014fc93531e4c2b6efac41b0a7 (diff)
sh: Ensure fixmap and store queue space can co-exist.
At the moment the top of the fixmap space is calculated from P4SEG, which places it at the end of the store queue space when that API is enabled. Make sure we use P3_ADDR_MAX here instead to find the proper address limit. With this done, it's also possible to switch to the generic vmalloc address range check now that VMALLOC_START/END encapsulate the translatable areas that we care about. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm')
-rw-r--r--arch/sh/mm/fault_32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c
index a469b95e88f..39e291c6b35 100644
--- a/arch/sh/mm/fault_32.c
+++ b/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;
/*