From 2252f1540913a316b70153f2e404b84fd29999a0 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 18 May 2012 19:30:05 +0900 Subject: [PATCH] --- yaml --- r: 305297 b: refs/heads/master c: c3e0af98792f9f1c840dc969f883e46d0ced3e00 h: refs/heads/master i: 305295: 321573236c58a2334820285b3b5ba468bd8b3e44 v: v3 --- [refs] | 2 +- trunk/arch/sh/include/asm/fixmap.h | 2 +- trunk/arch/sh/mm/fault.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6e9890bf1d06..b5eb7c12a45c 100644 --- 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 index 41cda1264bb0..cbe0186b6794 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 (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 index 16799f920f90..b0345f09c197 100644 --- 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; /*