openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

sh64: Kill off unused fixed I/O mapping window. 

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>
This commit is contained in:
Paul Mundt 2012-05-14 15:16:11 +09:00
parent 20e7c297ef
commit e45af0e083
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/include/asm/fixmap.h
View File

@ -96,7 +96,7 @@ extern void __clear_fixmap(enum fixed_addresses idx, pgprot_t flags);
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
#define FIXADDR_TOP (P3_ADDR_MAX - PAGE_SIZE) #define FIXADDR_TOP (P3_ADDR_MAX - PAGE_SIZE)
#else #else
#define FIXADDR_TOP (0xff000000 - PAGE_SIZE) #define FIXADDR_TOP ((unsigned long)(-PAGE_SIZE))
#endif #endif
#define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) #define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)

3
arch/sh/include/asm/pgtable_64.h
View File

@ -87,9 +87,6 @@ static __inline__ void set_pte(pte_t *pteptr, pte_t pteval)
#define pte_unmap(pte) do { } while (0) #define pte_unmap(pte) do { } while (0)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#define IOBASE_VADDR 0xff000000
#define IOBASE_END 0xffffffff
/* /*
* PTEL coherent flags. * PTEL coherent flags.
* See Chapter 17 ST50 CPU Core Volume 1, Architecture. * See Chapter 17 ST50 CPU Core Volume 1, Architecture.

3
arch/sh/mm/fault_64.c
View File

@ -246,8 +246,7 @@ asmlinkage int do_fast_page_fault(unsigned long long ssr_md,
tsk = current; tsk = current;
mm = tsk->mm; mm = tsk->mm;
if ((address >= VMALLOC_START && address < VMALLOC_END) || if ((address >= VMALLOC_START && address < VMALLOC_END)) {
(address >= IOBASE_VADDR && address < IOBASE_END)) {
if (ssr_md) if (ssr_md)
/* /*
* Process-contexts can never have this address * Process-contexts can never have this address