Skip to content

Commit

Permalink
sh64: Kill off unused fixed I/O mapping window.
Browse files Browse the repository at this point in the history
This was reworked some time ago to go through fixmaps instead, leaving
the range itself unused. As such, kill off the remaining references and
hand over the remaining space for fixmaps directly. This also makes it
possible to simplify the vmalloc fault case as we no longer have to care
about the special section.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed May 14, 2012
1 parent 20e7c29 commit e45af0e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 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 @@ -96,7 +96,7 @@ extern void __clear_fixmap(enum fixed_addresses idx, pgprot_t flags);
#ifdef CONFIG_SUPERH32
#define FIXADDR_TOP (P3_ADDR_MAX - PAGE_SIZE)
#else
#define FIXADDR_TOP (0xff000000 - PAGE_SIZE)
#define FIXADDR_TOP ((unsigned long)(-PAGE_SIZE))
#endif
#define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
Expand Down
3 changes: 0 additions & 3 deletions arch/sh/include/asm/pgtable_64.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ static __inline__ void set_pte(pte_t *pteptr, pte_t pteval)
#define pte_unmap(pte) do { } while (0)

#ifndef __ASSEMBLY__
#define IOBASE_VADDR 0xff000000
#define IOBASE_END 0xffffffff

/*
* PTEL coherent flags.
* See Chapter 17 ST50 CPU Core Volume 1, Architecture.
Expand Down
3 changes: 1 addition & 2 deletions arch/sh/mm/fault_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,7 @@ asmlinkage int do_fast_page_fault(unsigned long long ssr_md,
tsk = current;
mm = tsk->mm;

if ((address >= VMALLOC_START && address < VMALLOC_END) ||
(address >= IOBASE_VADDR && address < IOBASE_END)) {
if ((address >= VMALLOC_START && address < VMALLOC_END)) {
if (ssr_md)
/*
* Process-contexts can never have this address
Expand Down

0 comments on commit e45af0e

Please sign in to comment.