summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-11-21 09:07:06 +0100
committerPaul Mundt <lethal@linux-sh.org>2008-01-28 05:18:52 +0100
commit60b2249d45d44bd3494d55f5ea4bccd25c7f8281 (patch)
treea79cd2e691701cf78cba95095c4341d055ae656c /arch
parentsh: Merge sh64 Kconfig.debug options. (diff)
downloadlinux-60b2249d45d44bd3494d55f5ea4bccd25c7f8281.tar.xz
linux-60b2249d45d44bd3494d55f5ea4bccd25c7f8281.zip
sh: Move over SH-5 TLB and cache support code.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/mm/Makefile_647
-rw-r--r--arch/sh/mm/cache-sh5.c (renamed from arch/sh64/mm/cache.c)0
-rw-r--r--arch/sh/mm/tlb-sh5.c (renamed from arch/sh64/mm/tlb.c)0
3 files changed, 5 insertions, 2 deletions
diff --git a/arch/sh/mm/Makefile_64 b/arch/sh/mm/Makefile_64
index 82fe9072fd5c..5ff83583593e 100644
--- a/arch/sh/mm/Makefile_64
+++ b/arch/sh/mm/Makefile_64
@@ -5,12 +5,15 @@
obj-y := init.o extable_64.o consistent.o
mmu-y := tlb-nommu.o pg-nommu.o
-mmu-$(CONFIG_MMU) := fault_64.o ioremap_64.o tlb-flush_64.o
+mmu-$(CONFIG_MMU) := fault_64.o ioremap_64.o tlb-flush_64.o tlb-sh5.o
+
+ifndef CONFIG_CACHE_OFF
+obj-y += cache-sh5.o
+endif
obj-y += $(mmu-y)
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
-obj-$(CONFIG_PMB) += pmb.o
obj-$(CONFIG_NUMA) += numa.o
EXTRA_CFLAGS += -Werror
diff --git a/arch/sh64/mm/cache.c b/arch/sh/mm/cache-sh5.c
index 421487cfff4c..421487cfff4c 100644
--- a/arch/sh64/mm/cache.c
+++ b/arch/sh/mm/cache-sh5.c
diff --git a/arch/sh64/mm/tlb.c b/arch/sh/mm/tlb-sh5.c
index d517e7d70340..d517e7d70340 100644
--- a/arch/sh64/mm/tlb.c
+++ b/arch/sh/mm/tlb-sh5.c