---

yaml --- r: 77771 b: refs/heads/master c: 60b2249 h: refs/heads/master i: 77769: a74cc9b 77767: b98afcf v: v3
git-mirror · Jan 28, 2008 · 992b540 · 992b540
1 parent 10f4090
commit 992b540
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8214d52ace79163ded60a8605c1d6c44b8b2bd30
+refs/heads/master: 60b2249d45d44bd3494d55f5ea4bccd25c7f8281
diff --git a/trunk/arch/sh/mm/Makefile_64 b/trunk/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/trunk/arch/sh64/mm/cache.c → trunk/arch/sh/mm/cache-sh5.c b/trunk/arch/sh64/mm/cache.c → trunk/arch/sh/mm/cache-sh5.c
diff --git a/trunk/arch/sh64/mm/tlb.c → trunk/arch/sh/mm/tlb-sh5.c b/trunk/arch/sh64/mm/tlb.c → trunk/arch/sh/mm/tlb-sh5.c