sh: Split out ioremap in to _32 and _64 variants.

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

diff --git a/arch/sh/mm/Makefile_32 b/arch/sh/mm/Makefile_32
index cc68b265c025dd9e68def2d3d430016193561de8..b43884269c2a6f53052833e3ed45ce912a54fdf2 100644 (file)
--- a/arch/sh/mm/Makefile_32
+++ b/arch/sh/mm/Makefile_32
@@ -13,7 +13,7 @@ endif
 
 mmu-y                  := tlb-nommu.o pg-nommu.o
 mmu-$(CONFIG_MMU)      := fault.o clear_page.o copy_page.o tlb-flush.o \
-                          ioremap.o
+                          ioremap_32.o
 
 obj-y                  += $(mmu-y)
 

diff --git a/arch/sh/mm/Makefile_64 b/arch/sh/mm/Makefile_64
index de964a1500f499c4d15f97104822211eea5ccc0f..177f92863e4e134e880a7db4e3ecc5b6122b6a6d 100644 (file)
--- a/arch/sh/mm/Makefile_64
+++ b/arch/sh/mm/Makefile_64
@@ -4,6 +4,11 @@
 
 obj-y                  := init.o extable_64.o consistent.o
 
+mmu-y                  := tlb-nommu.o pg-nommu.o
+mmu-$(CONFIG_MMU)      := ioremap_64.o
+
+obj-y                  += $(mmu-y)
+
 obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o
 obj-$(CONFIG_PMB)              += pmb.o
 obj-$(CONFIG_NUMA)             += numa.o

diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap_32.c
similarity index 100%
rename from arch/sh/mm/ioremap.c
rename to arch/sh/mm/ioremap_32.c

diff --git a/arch/sh64/mm/ioremap.c b/arch/sh/mm/ioremap_64.c
similarity index 98%
rename from arch/sh64/mm/ioremap.c
rename to arch/sh/mm/ioremap_64.c
index 535304e6601f6d8987baba19e39cf09dd46b485b..95c85e2e43cf6c7e96a24fa063bef6b6f8df2f7c 100644 (file)
--- a/arch/sh64/mm/ioremap.c
+++ b/arch/sh/mm/ioremap_64.c
@@ -13,18 +13,17 @@
  *
  *   (C) Copyright 1995 1996 Linus Torvalds
  */
-#include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/io.h>
 #include <linux/ioport.h>
-#include <linux/bootmem.h>
-#include <linux/proc_fs.h>
 #include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/io.h>
+#include <asm/page.h>
 #include <asm/pgalloc.h>
+#include <asm/addrspace.h>
+#include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
+#include <asm/mmu.h>
 
 static void shmedia_mapioaddr(unsigned long, unsigned long);
 static unsigned long shmedia_ioremap(struct resource *, u32, int);