diff options
| -rw-r--r-- | arch/sh/lib/Makefile | 3 | ||||
| -rw-r--r-- | arch/sh/lib/clear_page.S (renamed from arch/sh/mm/clear_page.S) | 0 | ||||
| -rw-r--r-- | arch/sh/lib/copy_page.S (renamed from arch/sh/mm/copy_page.S) | 0 | ||||
| -rw-r--r-- | arch/sh/lib64/Makefile | 2 | ||||
| -rw-r--r-- | arch/sh/lib64/clear_page.S (renamed from arch/sh/lib64/page_clear.S) | 0 | ||||
| -rw-r--r-- | arch/sh/lib64/copy_page.S (renamed from arch/sh/lib64/page_copy.S) | 0 | ||||
| -rw-r--r-- | arch/sh/mm/Makefile_32 | 3 |
7 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile index 6f7ac9eeb54f..ebb55d1149f5 100644 --- a/arch/sh/lib/Makefile +++ b/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/arch/sh/mm/clear_page.S b/arch/sh/lib/clear_page.S index 7a7c81ee3f01..7a7c81ee3f01 100644 --- a/arch/sh/mm/clear_page.S +++ b/arch/sh/lib/clear_page.S diff --git a/arch/sh/mm/copy_page.S b/arch/sh/lib/copy_page.S index b879545fa28b..b879545fa28b 100644 --- a/arch/sh/mm/copy_page.S +++ b/arch/sh/lib/copy_page.S diff --git a/arch/sh/lib64/Makefile b/arch/sh/lib64/Makefile index 2f4086ac6f99..9950966923a0 100644 --- a/arch/sh/lib64/Makefile +++ b/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/arch/sh/lib64/page_clear.S b/arch/sh/lib64/clear_page.S index 007ab48ecc1c..007ab48ecc1c 100644 --- a/arch/sh/lib64/page_clear.S +++ b/arch/sh/lib64/clear_page.S diff --git a/arch/sh/lib64/page_copy.S b/arch/sh/lib64/copy_page.S index 0ec6fca63b56..0ec6fca63b56 100644 --- a/arch/sh/lib64/page_copy.S +++ b/arch/sh/lib64/copy_page.S diff --git a/arch/sh/mm/Makefile_32 b/arch/sh/mm/Makefile_32 index 095abd14592f..e295db60b91b 100644 --- a/arch/sh/mm/Makefile_32 +++ b/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) |