Selaa lähdekoodia

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

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Paul Mundt 17 vuotta sitten
vanhempi
commit
ad81eb9173
4 muutettua tiedostoa jossa 12 lisäystä ja 8 poistoa
  1. 1 1
      arch/sh/mm/Makefile_32
  2. 5 0
      arch/sh/mm/Makefile_64
  3. 0 0
      arch/sh/mm/ioremap_32.c
  4. 6 7
      arch/sh/mm/ioremap_64.c

+ 1 - 1
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)
 

+ 5 - 0
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

+ 0 - 0
arch/sh/mm/ioremap.c → arch/sh/mm/ioremap_32.c


+ 6 - 7
arch/sh64/mm/ioremap.c → 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);