From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 21 Nov 2007 08:07:06 +0000 (+0900)
Subject: sh: Move over SH-5 TLB and cache support code.
X-Git-Tag: v2.6.25-rc1~1169^2~91
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=60b2249d45d44bd3494d55f5ea4bccd25c7f8281;p=linux.git

sh: Move over SH-5 TLB and cache support code.

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

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
similarity index 100%
rename from arch/sh64/mm/cache.c
rename to arch/sh/mm/cache-sh5.c
diff --git a/arch/sh64/mm/tlb.c b/arch/sh/mm/tlb-sh5.c
similarity index 100%
rename from arch/sh64/mm/tlb.c
rename to arch/sh/mm/tlb-sh5.c