From b72dc65658c81aed56f5c2070e178a02f7f774b5 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 21 Nov 2007 22:46:14 +0900 Subject: [PATCH] --- yaml --- r: 77785 b: refs/heads/master c: 9895f9429cb489ba271c06767531083ae4c4bcbe h: refs/heads/master i: 77783: 79f092723b1577396bbddf0f6e8a77b49320d9b2 v: v3 --- [refs] | 2 +- trunk/arch/sh/lib/Makefile | 3 ++- trunk/arch/sh/{mm => lib}/clear_page.S | 0 trunk/arch/sh/{mm => lib}/copy_page.S | 0 trunk/arch/sh/lib64/Makefile | 2 +- trunk/arch/sh/lib64/{page_clear.S => clear_page.S} | 0 trunk/arch/sh/lib64/{page_copy.S => copy_page.S} | 0 trunk/arch/sh/mm/Makefile_32 | 3 +-- 8 files changed, 5 insertions(+), 5 deletions(-) rename trunk/arch/sh/{mm => lib}/clear_page.S (100%) rename trunk/arch/sh/{mm => lib}/copy_page.S (100%) rename trunk/arch/sh/lib64/{page_clear.S => clear_page.S} (100%) rename trunk/arch/sh/lib64/{page_copy.S => copy_page.S} (100%) diff --git a/[refs] b/[refs] index a8b43a5b9d35..690998c04645 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efddb4c882a64b7ca44b2a089d20020b30a2c6dd +refs/heads/master: 9895f9429cb489ba271c06767531083ae4c4bcbe diff --git a/trunk/arch/sh/lib/Makefile b/trunk/arch/sh/lib/Makefile index 6f7ac9eeb54f..ebb55d1149f5 100644 --- a/trunk/arch/sh/lib/Makefile +++ b/trunk/arch/sh/lib/Makefile @@ -8,6 +8,7 @@ lib-y = delay.o io.o memset.o memmove.o memchr.o \ memcpy-y := memcpy.o memcpy-$(CONFIG_CPU_SH4) := memcpy-sh4.o -lib-y += $(memcpy-y) +lib-$(CONFIG_MMU) += copy_page.o clear_page.o +lib-y += $(memcpy-y) EXTRA_CFLAGS += -Werror diff --git a/trunk/arch/sh/mm/clear_page.S b/trunk/arch/sh/lib/clear_page.S similarity index 100% rename from trunk/arch/sh/mm/clear_page.S rename to trunk/arch/sh/lib/clear_page.S diff --git a/trunk/arch/sh/mm/copy_page.S b/trunk/arch/sh/lib/copy_page.S similarity index 100% rename from trunk/arch/sh/mm/copy_page.S rename to trunk/arch/sh/lib/copy_page.S diff --git a/trunk/arch/sh/lib64/Makefile b/trunk/arch/sh/lib64/Makefile index 2f4086ac6f99..9950966923a0 100644 --- a/trunk/arch/sh/lib64/Makefile +++ b/trunk/arch/sh/lib64/Makefile @@ -11,5 +11,5 @@ # Panic should really be compiled as PIC lib-y := udelay.o c-checksum.o dbg.o panic.o memcpy.o copy_user_memcpy.o \ - page_copy.o page_clear.o + copy_page.o clear_page.o diff --git a/trunk/arch/sh/lib64/page_clear.S b/trunk/arch/sh/lib64/clear_page.S similarity index 100% rename from trunk/arch/sh/lib64/page_clear.S rename to trunk/arch/sh/lib64/clear_page.S diff --git a/trunk/arch/sh/lib64/page_copy.S b/trunk/arch/sh/lib64/copy_page.S similarity index 100% rename from trunk/arch/sh/lib64/page_copy.S rename to trunk/arch/sh/lib64/copy_page.S diff --git a/trunk/arch/sh/mm/Makefile_32 b/trunk/arch/sh/mm/Makefile_32 index 095abd14592f..e295db60b91b 100644 --- a/trunk/arch/sh/mm/Makefile_32 +++ b/trunk/arch/sh/mm/Makefile_32 @@ -12,8 +12,7 @@ obj-$(CONFIG_SH7705_CACHE_32KB) += cache-sh7705.o endif mmu-y := tlb-nommu.o pg-nommu.o -mmu-$(CONFIG_MMU) := fault_32.o clear_page.o copy_page.o tlbflush_32.o \ - ioremap_32.o +mmu-$(CONFIG_MMU) := fault_32.o tlbflush_32.o ioremap_32.o obj-y += $(mmu-y)