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>

diff --git a/arch/sh/include/asm/fixmap.h b/arch/sh/include/asm/fixmap.h
index 5f1ca55bcec8bba7f196ddf6eb02fc9a80302b29..41cda1264bb0c654cbf28e18bcf274bd471af803 100644 (file)
--- a/arch/sh/include/asm/fixmap.h
+++ b/arch/sh/include/asm/fixmap.h
@@ -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)

diff --git a/arch/sh/include/asm/pgtable_64.h b/arch/sh/include/asm/pgtable_64.h
index 42cb9dd52161169c838c57b854fb05dc6a85de81..dda8c82601b9c3cc2d41ee95f489ca8def3a1819 100644 (file)
--- a/arch/sh/include/asm/pgtable_64.h
+++ b/arch/sh/include/asm/pgtable_64.h
@@ -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.

diff --git a/arch/sh/mm/fault_64.c b/arch/sh/mm/fault_64.c
index 44a341029e7bcbbc563fd3e838b2241c0ea62cc1..33a921962d028b89066880df6f30a30b316971cf 100644 (file)
--- a/arch/sh/mm/fault_64.c
+++ b/arch/sh/mm/fault_64.c
@@ -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