Commit c3e0af98 authored by Paul Mundt's avatar Paul Mundt

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

This reverts commit 20e7c297.
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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 0e8963de
...@@ -94,7 +94,7 @@ extern void __clear_fixmap(enum fixed_addresses idx, pgprot_t flags); ...@@ -94,7 +94,7 @@ extern void __clear_fixmap(enum fixed_addresses idx, pgprot_t flags);
* at the top of mem.. * at the top of mem..
*/ */
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
#define FIXADDR_TOP (P3_ADDR_MAX - PAGE_SIZE) #define FIXADDR_TOP (P4SEG - PAGE_SIZE)
#else #else
#define FIXADDR_TOP ((unsigned long)(-PAGE_SIZE)) #define FIXADDR_TOP ((unsigned long)(-PAGE_SIZE))
#endif #endif
......
...@@ -169,8 +169,8 @@ static noinline int vmalloc_fault(unsigned long address) ...@@ -169,8 +169,8 @@ static noinline int vmalloc_fault(unsigned long address)
pmd_t *pmd_k; pmd_t *pmd_k;
pte_t *pte_k; pte_t *pte_k;
/* Make sure we are in vmalloc/module area: */ /* Make sure we are in vmalloc/module/P3 area: */
if (!is_vmalloc_addr((void *)address)) if (!(address >= P3SEG && address < P3_ADDR_MAX))
return -1; return -1;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment