sparc,sparc64: unify lib/

o Renamed files in sparc64 to <name>_64.S when identical to sparc32 files. o iomap.c were equal for sparc32 and sparc64 o adjusted sparc/Makefile now we have only one lib/ Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
selfmusing · Dec 4, 2008 · 478b8fe · 478b8fe
1 parent 18269c0
commit 478b8fe
Show file tree

Hide file tree

Showing 52 changed files with 23 additions and 73 deletions.
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
@@ -77,8 +77,7 @@ core-$(CONFIG_SPARC64) += arch/sparc64/kernel/
 core-y                 += arch/sparc/mm/ arch/sparc/math-emu/
 
 libs-y                 += arch/sparc/prom/
-libs-$(CONFIG_SPARC32) += arch/sparc/lib/
-libs-$(CONFIG_SPARC64) += arch/sparc64/lib/
+libs-y                 += arch/sparc/lib/
 
 drivers-$(CONFIG_OPROFILE)	+= arch/sparc/oprofile/
 

diff --git a/arch/sparc64/lib/GENbzero.S → arch/sparc/lib/GENbzero.S b/arch/sparc64/lib/GENbzero.S → arch/sparc/lib/GENbzero.S
diff --git a/arch/sparc64/lib/GENcopy_from_user.S → arch/sparc/lib/GENcopy_from_user.S b/arch/sparc64/lib/GENcopy_from_user.S → arch/sparc/lib/GENcopy_from_user.S
diff --git a/arch/sparc64/lib/GENcopy_to_user.S → arch/sparc/lib/GENcopy_to_user.S b/arch/sparc64/lib/GENcopy_to_user.S → arch/sparc/lib/GENcopy_to_user.S
diff --git a/arch/sparc64/lib/GENmemcpy.S → arch/sparc/lib/GENmemcpy.S b/arch/sparc64/lib/GENmemcpy.S → arch/sparc/lib/GENmemcpy.S
diff --git a/arch/sparc64/lib/GENpage.S → arch/sparc/lib/GENpage.S b/arch/sparc64/lib/GENpage.S → arch/sparc/lib/GENpage.S
diff --git a/arch/sparc64/lib/GENpatch.S → arch/sparc/lib/GENpatch.S b/arch/sparc64/lib/GENpatch.S → arch/sparc/lib/GENpatch.S
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
@@ -18,5 +18,27 @@ lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o
 lib-y                 += rwsem_$(BITS).o
 lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o
 
+lib-$(CONFIG_SPARC64) += PeeCeeI.o copy_page.o clear_page.o bzero.o
+lib-$(CONFIG_SPARC64) += csum_copy.o csum_copy_from_user.o csum_copy_to_user.o
+lib-$(CONFIG_SPARC64) += VISsave.o
+lib-$(CONFIG_SPARC64) += bitops.o
+
+lib-$(CONFIG_SPARC64) += U1memcpy.o U1copy_from_user.o U1copy_to_user.o
+
+lib-$(CONFIG_SPARC64) += U3memcpy.o U3copy_from_user.o U3copy_to_user.o
+lib-$(CONFIG_SPARC64) += U3patch.o
+
+lib-$(CONFIG_SPARC64) += NGmemcpy.o NGcopy_from_user.o NGcopy_to_user.o
+lib-$(CONFIG_SPARC64) += NGpatch.o NGpage.o NGbzero.o
+
+lib-$(CONFIG_SPARC64) += NG2memcpy.o NG2copy_from_user.o NG2copy_to_user.o
+lib-$(CONFIG_SPARC64) +=  NG2patch.o NG2page.o
+
+lib-$(CONFIG_SPARC64) += GENmemcpy.o GENcopy_from_user.o GENcopy_to_user.o
+lib-$(CONFIG_SPARC64) += GENpatch.o GENpage.o GENbzero.o
+
+lib-$(CONFIG_SPARC64) += copy_in_user.o user_fixup.o memmove.o
+lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o
+
 obj-y                 += iomap.o
 obj-$(CONFIG_SPARC32) += atomic32.o
diff --git a/arch/sparc64/lib/NG2copy_from_user.S → arch/sparc/lib/NG2copy_from_user.S b/arch/sparc64/lib/NG2copy_from_user.S → arch/sparc/lib/NG2copy_from_user.S
diff --git a/arch/sparc64/lib/NG2copy_to_user.S → arch/sparc/lib/NG2copy_to_user.S b/arch/sparc64/lib/NG2copy_to_user.S → arch/sparc/lib/NG2copy_to_user.S
diff --git a/arch/sparc64/lib/NG2memcpy.S → arch/sparc/lib/NG2memcpy.S b/arch/sparc64/lib/NG2memcpy.S → arch/sparc/lib/NG2memcpy.S
diff --git a/arch/sparc64/lib/NG2page.S → arch/sparc/lib/NG2page.S b/arch/sparc64/lib/NG2page.S → arch/sparc/lib/NG2page.S
diff --git a/arch/sparc64/lib/NG2patch.S → arch/sparc/lib/NG2patch.S b/arch/sparc64/lib/NG2patch.S → arch/sparc/lib/NG2patch.S
diff --git a/arch/sparc64/lib/NGbzero.S → arch/sparc/lib/NGbzero.S b/arch/sparc64/lib/NGbzero.S → arch/sparc/lib/NGbzero.S
diff --git a/arch/sparc64/lib/NGcopy_from_user.S → arch/sparc/lib/NGcopy_from_user.S b/arch/sparc64/lib/NGcopy_from_user.S → arch/sparc/lib/NGcopy_from_user.S
diff --git a/arch/sparc64/lib/NGcopy_to_user.S → arch/sparc/lib/NGcopy_to_user.S b/arch/sparc64/lib/NGcopy_to_user.S → arch/sparc/lib/NGcopy_to_user.S
diff --git a/arch/sparc64/lib/NGmemcpy.S → arch/sparc/lib/NGmemcpy.S b/arch/sparc64/lib/NGmemcpy.S → arch/sparc/lib/NGmemcpy.S
diff --git a/arch/sparc64/lib/NGpage.S → arch/sparc/lib/NGpage.S b/arch/sparc64/lib/NGpage.S → arch/sparc/lib/NGpage.S
diff --git a/arch/sparc64/lib/NGpatch.S → arch/sparc/lib/NGpatch.S b/arch/sparc64/lib/NGpatch.S → arch/sparc/lib/NGpatch.S
diff --git a/arch/sparc64/lib/PeeCeeI.c → arch/sparc/lib/PeeCeeI.c b/arch/sparc64/lib/PeeCeeI.c → arch/sparc/lib/PeeCeeI.c
diff --git a/arch/sparc64/lib/U1copy_from_user.S → arch/sparc/lib/U1copy_from_user.S b/arch/sparc64/lib/U1copy_from_user.S → arch/sparc/lib/U1copy_from_user.S
diff --git a/arch/sparc64/lib/U1copy_to_user.S → arch/sparc/lib/U1copy_to_user.S b/arch/sparc64/lib/U1copy_to_user.S → arch/sparc/lib/U1copy_to_user.S
diff --git a/arch/sparc64/lib/U1memcpy.S → arch/sparc/lib/U1memcpy.S b/arch/sparc64/lib/U1memcpy.S → arch/sparc/lib/U1memcpy.S
diff --git a/arch/sparc64/lib/U3copy_from_user.S → arch/sparc/lib/U3copy_from_user.S b/arch/sparc64/lib/U3copy_from_user.S → arch/sparc/lib/U3copy_from_user.S
diff --git a/arch/sparc64/lib/U3copy_to_user.S → arch/sparc/lib/U3copy_to_user.S b/arch/sparc64/lib/U3copy_to_user.S → arch/sparc/lib/U3copy_to_user.S
diff --git a/arch/sparc64/lib/U3memcpy.S → arch/sparc/lib/U3memcpy.S b/arch/sparc64/lib/U3memcpy.S → arch/sparc/lib/U3memcpy.S
diff --git a/arch/sparc64/lib/U3patch.S → arch/sparc/lib/U3patch.S b/arch/sparc64/lib/U3patch.S → arch/sparc/lib/U3patch.S
diff --git a/arch/sparc64/lib/VISsave.S → arch/sparc/lib/VISsave.S b/arch/sparc64/lib/VISsave.S → arch/sparc/lib/VISsave.S
diff --git a/arch/sparc64/lib/atomic.S → arch/sparc/lib/atomic_64.S b/arch/sparc64/lib/atomic.S → arch/sparc/lib/atomic_64.S
diff --git a/arch/sparc64/lib/bitops.S → arch/sparc/lib/bitops.S b/arch/sparc64/lib/bitops.S → arch/sparc/lib/bitops.S
diff --git a/arch/sparc64/lib/bzero.S → arch/sparc/lib/bzero.S b/arch/sparc64/lib/bzero.S → arch/sparc/lib/bzero.S
diff --git a/arch/sparc64/lib/checksum.S → arch/sparc/lib/checksum_64.S b/arch/sparc64/lib/checksum.S → arch/sparc/lib/checksum_64.S
diff --git a/arch/sparc64/lib/clear_page.S → arch/sparc/lib/clear_page.S b/arch/sparc64/lib/clear_page.S → arch/sparc/lib/clear_page.S
diff --git a/arch/sparc64/lib/copy_in_user.S → arch/sparc/lib/copy_in_user.S b/arch/sparc64/lib/copy_in_user.S → arch/sparc/lib/copy_in_user.S
diff --git a/arch/sparc64/lib/copy_page.S → arch/sparc/lib/copy_page.S b/arch/sparc64/lib/copy_page.S → arch/sparc/lib/copy_page.S
diff --git a/arch/sparc64/lib/csum_copy.S → arch/sparc/lib/csum_copy.S b/arch/sparc64/lib/csum_copy.S → arch/sparc/lib/csum_copy.S
diff --git a/arch/sparc64/lib/csum_copy_from_user.S → arch/sparc/lib/csum_copy_from_user.S b/arch/sparc64/lib/csum_copy_from_user.S → arch/sparc/lib/csum_copy_from_user.S
diff --git a/arch/sparc64/lib/csum_copy_to_user.S → arch/sparc/lib/csum_copy_to_user.S b/arch/sparc64/lib/csum_copy_to_user.S → arch/sparc/lib/csum_copy_to_user.S
diff --git a/arch/sparc64/lib/ipcsum.S → arch/sparc/lib/ipcsum.S b/arch/sparc64/lib/ipcsum.S → arch/sparc/lib/ipcsum.S
diff --git a/arch/sparc64/lib/mcount.S → arch/sparc/lib/mcount.S b/arch/sparc64/lib/mcount.S → arch/sparc/lib/mcount.S
diff --git a/arch/sparc64/lib/memcmp.S → arch/sparc/lib/memcmp_64.S b/arch/sparc64/lib/memcmp.S → arch/sparc/lib/memcmp_64.S
diff --git a/arch/sparc64/lib/memmove.S → arch/sparc/lib/memmove.S b/arch/sparc64/lib/memmove.S → arch/sparc/lib/memmove.S
diff --git a/arch/sparc64/lib/memscan.S → arch/sparc/lib/memscan_64.S b/arch/sparc64/lib/memscan.S → arch/sparc/lib/memscan_64.S
diff --git a/arch/sparc64/lib/rwsem.S → arch/sparc/lib/rwsem_64.S b/arch/sparc64/lib/rwsem.S → arch/sparc/lib/rwsem_64.S
diff --git a/arch/sparc64/lib/strlen.S → arch/sparc/lib/strlen_64.S b/arch/sparc64/lib/strlen.S → arch/sparc/lib/strlen_64.S
diff --git a/arch/sparc64/lib/strlen_user.S → arch/sparc/lib/strlen_user_64.S b/arch/sparc64/lib/strlen_user.S → arch/sparc/lib/strlen_user_64.S
diff --git a/arch/sparc64/lib/strncmp.S → arch/sparc/lib/strncmp_64.S b/arch/sparc64/lib/strncmp.S → arch/sparc/lib/strncmp_64.S
diff --git a/arch/sparc64/lib/strncpy_from_user.S → arch/sparc/lib/strncpy_from_user_64.S b/arch/sparc64/lib/strncpy_from_user.S → arch/sparc/lib/strncpy_from_user_64.S
diff --git a/arch/sparc64/lib/user_fixup.c → arch/sparc/lib/user_fixup.c b/arch/sparc64/lib/user_fixup.c → arch/sparc/lib/user_fixup.c
diff --git a/arch/sparc64/lib/xor.S → arch/sparc/lib/xor.S b/arch/sparc64/lib/xor.S → arch/sparc/lib/xor.S
diff --git a/arch/sparc64/lib/Makefile b/arch/sparc64/lib/Makefile
diff --git a/arch/sparc64/lib/iomap.c b/arch/sparc64/lib/iomap.c