sh: Reclaim beginning of P3 space for vmalloc area.

The first 1MB of P3 space was reserved and used for page colouring,
as we've reworked that to use fixmaps, we can reclaim the space and
hand it back to VMALLOC_START.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index 5d0f73a4fbbbd1e618f365e2f761ef8206d37e95..86486326ef1d5fbc465d47b6542c867edb688fa2 100644 (file)
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -98,9 +98,6 @@ void __init p3_cache_init(void)
        }
 
        emit_cache_params();
-
-       if (ioremap_page_range(P3SEG, P3SEG + (PAGE_SIZE * 4), 0, PAGE_KERNEL))
-               panic("%s failed.", __FUNCTION__);
 }
 
 /*

diff --git a/include/asm-sh/pgtable.h b/include/asm-sh/pgtable.h
index 22efffe450195c07c8e42afd825cdd3f6370b198..e3fae12c0e499574f62e0300391ebd7a5328dbf0 100644 (file)
--- a/include/asm-sh/pgtable.h
+++ b/include/asm-sh/pgtable.h
@@ -55,11 +55,7 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 
 #define PTE_PHYS_MASK          (0x20000000 - PAGE_SIZE)
 
-/*
- * First 1MB map is used by fixed purpose.
- * Currently only 4-entry (16kB) is used (see arch/sh/mm/cache.c)
- */
-#define VMALLOC_START  (P3SEG+0x00100000)
+#define VMALLOC_START  (P3SEG)
 #define VMALLOC_END    (FIXADDR_START-2*PAGE_SIZE)
 
 /*