diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-11-11 18:43:33 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-28 13:18:46 +0900 |
| commit | ad81eb91731fe7e43ce5c91278bc33bded6cbda1 (patch) | |
| tree | 193e125d6a4cacc3e03732a5ad0e2c372023f7e9 | |
| parent | 4b7be4f2e0235c6824641503e2a8ff3b85e105d7 (diff) | |
sh: Split out ioremap in to _32 and _64 variants.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/mm/Makefile_32 | 2 | ||||
| -rw-r--r-- | arch/sh/mm/Makefile_64 | 5 | ||||
| -rw-r--r-- | arch/sh/mm/ioremap_32.c (renamed from arch/sh/mm/ioremap.c) | 0 | ||||
| -rw-r--r-- | arch/sh/mm/ioremap_64.c (renamed from arch/sh64/mm/ioremap.c) | 13 |
4 files changed, 12 insertions, 8 deletions
diff --git a/arch/sh/mm/Makefile_32 b/arch/sh/mm/Makefile_32 index cc68b265c02..b43884269c2 100644 --- 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 de964a1500f..177f92863e4 100644 --- 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 index 0c7b7e33abd..0c7b7e33abd 100644 --- a/arch/sh/mm/ioremap.c +++ b/arch/sh/mm/ioremap_32.c diff --git a/arch/sh64/mm/ioremap.c b/arch/sh/mm/ioremap_64.c index 535304e6601..95c85e2e43c 100644 --- 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); |