From 20e7c297efeca0861adcca073a0d283da659834b Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 14 May 2012 15:11:35 +0900 Subject: 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 --- arch/sh/include/asm/fixmap.h | 2 +- arch/sh/mm/fault_32.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/sh') diff --git a/arch/sh/include/asm/fixmap.h b/arch/sh/include/asm/fixmap.h index bd7e79a1265..5f1ca55bcec 100644 --- a/arch/sh/include/asm/fixmap.h +++ b/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/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; /* -- cgit v1.2.3