From 992b54049c278bd1d00b1f6c00bcb346e37aeaa5 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 21 Nov 2007 17:07:06 +0900 Subject: [PATCH] --- yaml --- r: 77771 b: refs/heads/master c: 60b2249d45d44bd3494d55f5ea4bccd25c7f8281 h: refs/heads/master i: 77769: a74cc9ba2e9a4c4041fea519bd3ba8b16fad570b 77767: b98afcfad380d3d69502e60cab2ccd87f7be7135 v: v3 --- [refs] | 2 +- trunk/arch/sh/mm/Makefile_64 | 7 +++++-- trunk/arch/{sh64/mm/cache.c => sh/mm/cache-sh5.c} | 0 trunk/arch/{sh64/mm/tlb.c => sh/mm/tlb-sh5.c} | 0 4 files changed, 6 insertions(+), 3 deletions(-) rename trunk/arch/{sh64/mm/cache.c => sh/mm/cache-sh5.c} (100%) rename trunk/arch/{sh64/mm/tlb.c => sh/mm/tlb-sh5.c} (100%) diff --git a/[refs] b/[refs] index ae8492a93f26..c465bfa38ce0 100644 --- 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 index 82fe9072fd5c..5ff83583593e 100644 --- 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 b/trunk/arch/sh/mm/cache-sh5.c similarity index 100% rename from trunk/arch/sh64/mm/cache.c rename to trunk/arch/sh/mm/cache-sh5.c diff --git a/trunk/arch/sh64/mm/tlb.c b/trunk/arch/sh/mm/tlb-sh5.c similarity index 100% rename from trunk/arch/sh64/mm/tlb.c rename to trunk/arch/sh/mm/tlb-sh5.c