diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-12-03 03:10:25 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-04 09:17:19 -0800 |
commit | 478b8fecda511942404ac232897a718cecd13e48 (patch) | |
tree | e022fce8ca92f93a000e1cd686255f0b126e9fd5 /arch | |
parent | 18269c0fd4db9bec2668f895f21d742486ccb90f (diff) | |
download | talos-obmc-linux-478b8fecda511942404ac232897a718cecd13e48.tar.gz talos-obmc-linux-478b8fecda511942404ac232897a718cecd13e48.zip |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/Makefile | 3 | ||||
-rw-r--r-- | arch/sparc/lib/GENbzero.S (renamed from arch/sparc64/lib/GENbzero.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/GENcopy_from_user.S (renamed from arch/sparc64/lib/GENcopy_from_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/GENcopy_to_user.S (renamed from arch/sparc64/lib/GENcopy_to_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/GENmemcpy.S (renamed from arch/sparc64/lib/GENmemcpy.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/GENpage.S (renamed from arch/sparc64/lib/GENpage.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/GENpatch.S (renamed from arch/sparc64/lib/GENpatch.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/Makefile | 22 | ||||
-rw-r--r-- | arch/sparc/lib/NG2copy_from_user.S (renamed from arch/sparc64/lib/NG2copy_from_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/NG2copy_to_user.S (renamed from arch/sparc64/lib/NG2copy_to_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/NG2memcpy.S (renamed from arch/sparc64/lib/NG2memcpy.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/NG2page.S (renamed from arch/sparc64/lib/NG2page.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/NG2patch.S (renamed from arch/sparc64/lib/NG2patch.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/NGbzero.S (renamed from arch/sparc64/lib/NGbzero.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/NGcopy_from_user.S (renamed from arch/sparc64/lib/NGcopy_from_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/NGcopy_to_user.S (renamed from arch/sparc64/lib/NGcopy_to_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/NGmemcpy.S (renamed from arch/sparc64/lib/NGmemcpy.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/NGpage.S (renamed from arch/sparc64/lib/NGpage.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/NGpatch.S (renamed from arch/sparc64/lib/NGpatch.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/PeeCeeI.c (renamed from arch/sparc64/lib/PeeCeeI.c) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/U1copy_from_user.S (renamed from arch/sparc64/lib/U1copy_from_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/U1copy_to_user.S (renamed from arch/sparc64/lib/U1copy_to_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/U1memcpy.S (renamed from arch/sparc64/lib/U1memcpy.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/U3copy_from_user.S (renamed from arch/sparc64/lib/U3copy_from_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/U3copy_to_user.S (renamed from arch/sparc64/lib/U3copy_to_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/U3memcpy.S (renamed from arch/sparc64/lib/U3memcpy.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/U3patch.S (renamed from arch/sparc64/lib/U3patch.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/VISsave.S (renamed from arch/sparc64/lib/VISsave.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/atomic_64.S (renamed from arch/sparc64/lib/atomic.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/bitops.S (renamed from arch/sparc64/lib/bitops.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/bzero.S (renamed from arch/sparc64/lib/bzero.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/checksum_64.S (renamed from arch/sparc64/lib/checksum.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/clear_page.S (renamed from arch/sparc64/lib/clear_page.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/copy_in_user.S (renamed from arch/sparc64/lib/copy_in_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/copy_page.S (renamed from arch/sparc64/lib/copy_page.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/csum_copy.S (renamed from arch/sparc64/lib/csum_copy.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/csum_copy_from_user.S (renamed from arch/sparc64/lib/csum_copy_from_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/csum_copy_to_user.S (renamed from arch/sparc64/lib/csum_copy_to_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/ipcsum.S (renamed from arch/sparc64/lib/ipcsum.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/mcount.S (renamed from arch/sparc64/lib/mcount.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/memcmp_64.S (renamed from arch/sparc64/lib/memcmp.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/memmove.S (renamed from arch/sparc64/lib/memmove.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/memscan_64.S (renamed from arch/sparc64/lib/memscan.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/rwsem_64.S (renamed from arch/sparc64/lib/rwsem.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/strlen_64.S (renamed from arch/sparc64/lib/strlen.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/strlen_user_64.S (renamed from arch/sparc64/lib/strlen_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/strncmp_64.S (renamed from arch/sparc64/lib/strncmp.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/strncpy_from_user_64.S (renamed from arch/sparc64/lib/strncpy_from_user.S) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/user_fixup.c (renamed from arch/sparc64/lib/user_fixup.c) | 0 | ||||
-rw-r--r-- | arch/sparc/lib/xor.S (renamed from arch/sparc64/lib/xor.S) | 0 | ||||
-rw-r--r-- | arch/sparc64/lib/Makefile | 23 | ||||
-rw-r--r-- | arch/sparc64/lib/iomap.c | 48 |
52 files changed, 23 insertions, 73 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index 317aad600ed7..b1d691489ed4 100644 --- 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 b/arch/sparc/lib/GENbzero.S index 6a4f956a2f7a..6a4f956a2f7a 100644 --- a/arch/sparc64/lib/GENbzero.S +++ b/arch/sparc/lib/GENbzero.S diff --git a/arch/sparc64/lib/GENcopy_from_user.S b/arch/sparc/lib/GENcopy_from_user.S index 2b9df99e87f9..2b9df99e87f9 100644 --- a/arch/sparc64/lib/GENcopy_from_user.S +++ b/arch/sparc/lib/GENcopy_from_user.S diff --git a/arch/sparc64/lib/GENcopy_to_user.S b/arch/sparc/lib/GENcopy_to_user.S index bb3f7084daf9..bb3f7084daf9 100644 --- a/arch/sparc64/lib/GENcopy_to_user.S +++ b/arch/sparc/lib/GENcopy_to_user.S diff --git a/arch/sparc64/lib/GENmemcpy.S b/arch/sparc/lib/GENmemcpy.S index 89358ee94851..89358ee94851 100644 --- a/arch/sparc64/lib/GENmemcpy.S +++ b/arch/sparc/lib/GENmemcpy.S diff --git a/arch/sparc64/lib/GENpage.S b/arch/sparc/lib/GENpage.S index 2ef9d05f21bc..2ef9d05f21bc 100644 --- a/arch/sparc64/lib/GENpage.S +++ b/arch/sparc/lib/GENpage.S diff --git a/arch/sparc64/lib/GENpatch.S b/arch/sparc/lib/GENpatch.S index fab9e89f16bd..fab9e89f16bd 100644 --- a/arch/sparc64/lib/GENpatch.S +++ b/arch/sparc/lib/GENpatch.S diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index f2650545c774..05ae5c945e35 100644 --- 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 b/arch/sparc/lib/NG2copy_from_user.S index c77ef5f22102..c77ef5f22102 100644 --- a/arch/sparc64/lib/NG2copy_from_user.S +++ b/arch/sparc/lib/NG2copy_from_user.S diff --git a/arch/sparc64/lib/NG2copy_to_user.S b/arch/sparc/lib/NG2copy_to_user.S index 4bd4093acbbd..4bd4093acbbd 100644 --- a/arch/sparc64/lib/NG2copy_to_user.S +++ b/arch/sparc/lib/NG2copy_to_user.S diff --git a/arch/sparc64/lib/NG2memcpy.S b/arch/sparc/lib/NG2memcpy.S index 0aed75653b50..0aed75653b50 100644 --- a/arch/sparc64/lib/NG2memcpy.S +++ b/arch/sparc/lib/NG2memcpy.S diff --git a/arch/sparc64/lib/NG2page.S b/arch/sparc/lib/NG2page.S index 73b6b7c72cbf..73b6b7c72cbf 100644 --- a/arch/sparc64/lib/NG2page.S +++ b/arch/sparc/lib/NG2page.S diff --git a/arch/sparc64/lib/NG2patch.S b/arch/sparc/lib/NG2patch.S index 28c36f06a6d1..28c36f06a6d1 100644 --- a/arch/sparc64/lib/NG2patch.S +++ b/arch/sparc/lib/NG2patch.S diff --git a/arch/sparc64/lib/NGbzero.S b/arch/sparc/lib/NGbzero.S index 814d5f7a45e1..814d5f7a45e1 100644 --- a/arch/sparc64/lib/NGbzero.S +++ b/arch/sparc/lib/NGbzero.S diff --git a/arch/sparc64/lib/NGcopy_from_user.S b/arch/sparc/lib/NGcopy_from_user.S index e7f433f71b42..e7f433f71b42 100644 --- a/arch/sparc64/lib/NGcopy_from_user.S +++ b/arch/sparc/lib/NGcopy_from_user.S diff --git a/arch/sparc64/lib/NGcopy_to_user.S b/arch/sparc/lib/NGcopy_to_user.S index 6ea01c5532a0..6ea01c5532a0 100644 --- a/arch/sparc64/lib/NGcopy_to_user.S +++ b/arch/sparc/lib/NGcopy_to_user.S diff --git a/arch/sparc64/lib/NGmemcpy.S b/arch/sparc/lib/NGmemcpy.S index 96a14caf6966..96a14caf6966 100644 --- a/arch/sparc64/lib/NGmemcpy.S +++ b/arch/sparc/lib/NGmemcpy.S diff --git a/arch/sparc64/lib/NGpage.S b/arch/sparc/lib/NGpage.S index 428920de05ba..428920de05ba 100644 --- a/arch/sparc64/lib/NGpage.S +++ b/arch/sparc/lib/NGpage.S diff --git a/arch/sparc64/lib/NGpatch.S b/arch/sparc/lib/NGpatch.S index 3b0674fc3366..3b0674fc3366 100644 --- a/arch/sparc64/lib/NGpatch.S +++ b/arch/sparc/lib/NGpatch.S diff --git a/arch/sparc64/lib/PeeCeeI.c b/arch/sparc/lib/PeeCeeI.c index 46053e6ddd7b..46053e6ddd7b 100644 --- a/arch/sparc64/lib/PeeCeeI.c +++ b/arch/sparc/lib/PeeCeeI.c diff --git a/arch/sparc64/lib/U1copy_from_user.S b/arch/sparc/lib/U1copy_from_user.S index 3192b0bf4fab..3192b0bf4fab 100644 --- a/arch/sparc64/lib/U1copy_from_user.S +++ b/arch/sparc/lib/U1copy_from_user.S diff --git a/arch/sparc64/lib/U1copy_to_user.S b/arch/sparc/lib/U1copy_to_user.S index d1210ffb0b82..d1210ffb0b82 100644 --- a/arch/sparc64/lib/U1copy_to_user.S +++ b/arch/sparc/lib/U1copy_to_user.S diff --git a/arch/sparc64/lib/U1memcpy.S b/arch/sparc/lib/U1memcpy.S index bafd2fc07acb..bafd2fc07acb 100644 --- a/arch/sparc64/lib/U1memcpy.S +++ b/arch/sparc/lib/U1memcpy.S diff --git a/arch/sparc64/lib/U3copy_from_user.S b/arch/sparc/lib/U3copy_from_user.S index f5bfc8d9d216..f5bfc8d9d216 100644 --- a/arch/sparc64/lib/U3copy_from_user.S +++ b/arch/sparc/lib/U3copy_from_user.S diff --git a/arch/sparc64/lib/U3copy_to_user.S b/arch/sparc/lib/U3copy_to_user.S index 2334f111bb0c..2334f111bb0c 100644 --- a/arch/sparc64/lib/U3copy_to_user.S +++ b/arch/sparc/lib/U3copy_to_user.S diff --git a/arch/sparc64/lib/U3memcpy.S b/arch/sparc/lib/U3memcpy.S index 7cae9cc6a204..7cae9cc6a204 100644 --- a/arch/sparc64/lib/U3memcpy.S +++ b/arch/sparc/lib/U3memcpy.S diff --git a/arch/sparc64/lib/U3patch.S b/arch/sparc/lib/U3patch.S index ecc302619a6e..ecc302619a6e 100644 --- a/arch/sparc64/lib/U3patch.S +++ b/arch/sparc/lib/U3patch.S diff --git a/arch/sparc64/lib/VISsave.S b/arch/sparc/lib/VISsave.S index b320ae9e2e2e..b320ae9e2e2e 100644 --- a/arch/sparc64/lib/VISsave.S +++ b/arch/sparc/lib/VISsave.S diff --git a/arch/sparc64/lib/atomic.S b/arch/sparc/lib/atomic_64.S index 0268210ca168..0268210ca168 100644 --- a/arch/sparc64/lib/atomic.S +++ b/arch/sparc/lib/atomic_64.S diff --git a/arch/sparc64/lib/bitops.S b/arch/sparc/lib/bitops.S index 2b7228cb8c22..2b7228cb8c22 100644 --- a/arch/sparc64/lib/bitops.S +++ b/arch/sparc/lib/bitops.S diff --git a/arch/sparc64/lib/bzero.S b/arch/sparc/lib/bzero.S index c7bbae8c590f..c7bbae8c590f 100644 --- a/arch/sparc64/lib/bzero.S +++ b/arch/sparc/lib/bzero.S diff --git a/arch/sparc64/lib/checksum.S b/arch/sparc/lib/checksum_64.S index 1d230f693dc4..1d230f693dc4 100644 --- a/arch/sparc64/lib/checksum.S +++ b/arch/sparc/lib/checksum_64.S diff --git a/arch/sparc64/lib/clear_page.S b/arch/sparc/lib/clear_page.S index 77e531f6c2a7..77e531f6c2a7 100644 --- a/arch/sparc64/lib/clear_page.S +++ b/arch/sparc/lib/clear_page.S diff --git a/arch/sparc64/lib/copy_in_user.S b/arch/sparc/lib/copy_in_user.S index 650af3f21f78..650af3f21f78 100644 --- a/arch/sparc64/lib/copy_in_user.S +++ b/arch/sparc/lib/copy_in_user.S diff --git a/arch/sparc64/lib/copy_page.S b/arch/sparc/lib/copy_page.S index b243d3b606ba..b243d3b606ba 100644 --- a/arch/sparc64/lib/copy_page.S +++ b/arch/sparc/lib/copy_page.S diff --git a/arch/sparc64/lib/csum_copy.S b/arch/sparc/lib/csum_copy.S index e566c770a0f6..e566c770a0f6 100644 --- a/arch/sparc64/lib/csum_copy.S +++ b/arch/sparc/lib/csum_copy.S diff --git a/arch/sparc64/lib/csum_copy_from_user.S b/arch/sparc/lib/csum_copy_from_user.S index a22eddbe5dba..a22eddbe5dba 100644 --- a/arch/sparc64/lib/csum_copy_from_user.S +++ b/arch/sparc/lib/csum_copy_from_user.S diff --git a/arch/sparc64/lib/csum_copy_to_user.S b/arch/sparc/lib/csum_copy_to_user.S index d5b12f441f02..d5b12f441f02 100644 --- a/arch/sparc64/lib/csum_copy_to_user.S +++ b/arch/sparc/lib/csum_copy_to_user.S diff --git a/arch/sparc64/lib/ipcsum.S b/arch/sparc/lib/ipcsum.S index 58ca5b9a8778..58ca5b9a8778 100644 --- a/arch/sparc64/lib/ipcsum.S +++ b/arch/sparc/lib/ipcsum.S diff --git a/arch/sparc64/lib/mcount.S b/arch/sparc/lib/mcount.S index 7ce9c65f3592..7ce9c65f3592 100644 --- a/arch/sparc64/lib/mcount.S +++ b/arch/sparc/lib/mcount.S diff --git a/arch/sparc64/lib/memcmp.S b/arch/sparc/lib/memcmp_64.S index d3fdaa898566..d3fdaa898566 100644 --- a/arch/sparc64/lib/memcmp.S +++ b/arch/sparc/lib/memcmp_64.S diff --git a/arch/sparc64/lib/memmove.S b/arch/sparc/lib/memmove.S index 97395802c23c..97395802c23c 100644 --- a/arch/sparc64/lib/memmove.S +++ b/arch/sparc/lib/memmove.S diff --git a/arch/sparc64/lib/memscan.S b/arch/sparc/lib/memscan_64.S index 5686dfa5dc15..5686dfa5dc15 100644 --- a/arch/sparc64/lib/memscan.S +++ b/arch/sparc/lib/memscan_64.S diff --git a/arch/sparc64/lib/rwsem.S b/arch/sparc/lib/rwsem_64.S index 91a7d29a79d5..91a7d29a79d5 100644 --- a/arch/sparc64/lib/rwsem.S +++ b/arch/sparc/lib/rwsem_64.S diff --git a/arch/sparc64/lib/strlen.S b/arch/sparc/lib/strlen_64.S index e9ba1920d818..e9ba1920d818 100644 --- a/arch/sparc64/lib/strlen.S +++ b/arch/sparc/lib/strlen_64.S diff --git a/arch/sparc64/lib/strlen_user.S b/arch/sparc/lib/strlen_user_64.S index 114ed111e251..114ed111e251 100644 --- a/arch/sparc64/lib/strlen_user.S +++ b/arch/sparc/lib/strlen_user_64.S diff --git a/arch/sparc64/lib/strncmp.S b/arch/sparc/lib/strncmp_64.S index 980e83751556..980e83751556 100644 --- a/arch/sparc64/lib/strncmp.S +++ b/arch/sparc/lib/strncmp_64.S diff --git a/arch/sparc64/lib/strncpy_from_user.S b/arch/sparc/lib/strncpy_from_user_64.S index 511c8f136f95..511c8f136f95 100644 --- a/arch/sparc64/lib/strncpy_from_user.S +++ b/arch/sparc/lib/strncpy_from_user_64.S diff --git a/arch/sparc64/lib/user_fixup.c b/arch/sparc/lib/user_fixup.c index 05a361b0a1a4..05a361b0a1a4 100644 --- a/arch/sparc64/lib/user_fixup.c +++ b/arch/sparc/lib/user_fixup.c diff --git a/arch/sparc64/lib/xor.S b/arch/sparc/lib/xor.S index f44f58f40234..f44f58f40234 100644 --- a/arch/sparc64/lib/xor.S +++ b/arch/sparc/lib/xor.S diff --git a/arch/sparc64/lib/Makefile b/arch/sparc64/lib/Makefile deleted file mode 100644 index f095e13910bc..000000000000 --- a/arch/sparc64/lib/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# -# Makefile for Sparc64 library files.. -# - -EXTRA_AFLAGS := -ansi -EXTRA_CFLAGS := -Werror - -lib-y := PeeCeeI.o copy_page.o clear_page.o strlen.o strncmp.o \ - memscan.o strncpy_from_user.o strlen_user.o memcmp.o checksum.o \ - bzero.o csum_copy.o csum_copy_from_user.o csum_copy_to_user.o \ - VISsave.o atomic.o bitops.o \ - U1memcpy.o U1copy_from_user.o U1copy_to_user.o \ - U3memcpy.o U3copy_from_user.o U3copy_to_user.o U3patch.o \ - NGmemcpy.o NGcopy_from_user.o NGcopy_to_user.o NGpatch.o \ - NGpage.o NGbzero.o \ - NG2memcpy.o NG2copy_from_user.o NG2copy_to_user.o NG2patch.o \ - NG2page.o \ - GENmemcpy.o GENcopy_from_user.o GENcopy_to_user.o GENpatch.o \ - GENpage.o GENbzero.o \ - copy_in_user.o user_fixup.o memmove.o \ - mcount.o ipcsum.o rwsem.o xor.o - -obj-y += iomap.o diff --git a/arch/sparc64/lib/iomap.c b/arch/sparc64/lib/iomap.c deleted file mode 100644 index 7120ebbd4d03..000000000000 --- a/arch/sparc64/lib/iomap.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Implement the sparc64 iomap interfaces - */ -#include <linux/pci.h> -#include <linux/module.h> -#include <asm/io.h> - -/* Create a virtual mapping cookie for an IO port range */ -void __iomem *ioport_map(unsigned long port, unsigned int nr) -{ - return (void __iomem *) (unsigned long) port; -} - -void ioport_unmap(void __iomem *addr) -{ - /* Nothing to do */ -} -EXPORT_SYMBOL(ioport_map); -EXPORT_SYMBOL(ioport_unmap); - -/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ -void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) -{ - resource_size_t start = pci_resource_start(dev, bar); - resource_size_t len = pci_resource_len(dev, bar); - unsigned long flags = pci_resource_flags(dev, bar); - - if (!len || !start) - return NULL; - if (maxlen && len > maxlen) - len = maxlen; - if (flags & IORESOURCE_IO) - return ioport_map(start, len); - if (flags & IORESOURCE_MEM) { - if (flags & IORESOURCE_CACHEABLE) - return ioremap(start, len); - return ioremap_nocache(start, len); - } - /* What? */ - return NULL; -} - -void pci_iounmap(struct pci_dev *dev, void __iomem * addr) -{ - /* nothing to do */ -} -EXPORT_SYMBOL(pci_iomap); -EXPORT_SYMBOL(pci_iounmap); |