Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+3 -3
+1 -1
arch/sh/include/asm/fixmap.h
··· 94 94 * at the top of mem.. 95 95 */ 96 96 #ifdef CONFIG_SUPERH32 97 - #define FIXADDR_TOP (P3_ADDR_MAX - PAGE_SIZE) 97 + #define FIXADDR_TOP (P4SEG - PAGE_SIZE) 98 98 #else 99 99 #define FIXADDR_TOP ((unsigned long)(-PAGE_SIZE)) 100 100 #endif
+2 -2
arch/sh/mm/fault.c
··· 169 169 pmd_t *pmd_k; 170 170 pte_t *pte_k; 171 171 172 - /* Make sure we are in vmalloc/module area: */ 173 - if (!is_vmalloc_addr((void *)address)) 172 + /* Make sure we are in vmalloc/module/P3 area: */ 173 + if (!(address >= P3SEG && address < P3_ADDR_MAX)) 174 174 return -1; 175 175 176 176 /*