Skip to content

Commit

Permalink
Revert "sh: Ensure fixmap and store queue space can co-exist."
Browse files Browse the repository at this point in the history
This reverts commit 20e7c29.
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>
  • Loading branch information
Paul Mundt committed May 18, 2012
1 parent 0e8963d commit c3e0af9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/sh/include/asm/fixmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions arch/sh/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down

0 comments on commit c3e0af9

Please sign in to comment.