diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-16 21:39:30 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-08-07 23:55:43 -0400 |
commit | d3867f0483103b8ff7edfdea3ef1981c03d96891 (patch) | |
tree | 233c755ae14aba69aae25ab345abcb6cf4edf466 /arch/sparc/lib | |
parent | 9445aa1a3062a75a4d9de78026816ebc941e7b99 (diff) |
sparc: move exports to definitions
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sparc/lib')
35 files changed, 108 insertions, 179 deletions
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index 3269b0234093..885f00e81d1a 100644 --- a/arch/sparc/lib/Makefile +++ b/arch/sparc/lib/Makefile | |||
@@ -43,5 +43,4 @@ lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o hweight.o ffs.o | |||
43 | 43 | ||
44 | obj-$(CONFIG_SPARC64) += iomap.o | 44 | obj-$(CONFIG_SPARC64) += iomap.o |
45 | obj-$(CONFIG_SPARC32) += atomic32.o ucmpdi2.o | 45 | obj-$(CONFIG_SPARC32) += atomic32.o ucmpdi2.o |
46 | obj-y += ksyms.o | ||
47 | obj-$(CONFIG_SPARC64) += PeeCeeI.o | 46 | obj-$(CONFIG_SPARC64) += PeeCeeI.o |
diff --git a/arch/sparc/lib/U1memcpy.S b/arch/sparc/lib/U1memcpy.S index 3e6209ebb7d7..97e1b211090c 100644 --- a/arch/sparc/lib/U1memcpy.S +++ b/arch/sparc/lib/U1memcpy.S | |||
@@ -7,6 +7,7 @@ | |||
7 | #ifdef __KERNEL__ | 7 | #ifdef __KERNEL__ |
8 | #include <asm/visasm.h> | 8 | #include <asm/visasm.h> |
9 | #include <asm/asi.h> | 9 | #include <asm/asi.h> |
10 | #include <asm/export.h> | ||
10 | #define GLOBAL_SPARE g7 | 11 | #define GLOBAL_SPARE g7 |
11 | #else | 12 | #else |
12 | #define GLOBAL_SPARE g5 | 13 | #define GLOBAL_SPARE g5 |
@@ -567,3 +568,4 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ | |||
567 | mov EX_RETVAL(%o4), %o0 | 568 | mov EX_RETVAL(%o4), %o0 |
568 | 569 | ||
569 | .size FUNC_NAME, .-FUNC_NAME | 570 | .size FUNC_NAME, .-FUNC_NAME |
571 | EXPORT_SYMBOL(FUNC_NAME) | ||
diff --git a/arch/sparc/lib/VISsave.S b/arch/sparc/lib/VISsave.S index 62c2647bd5ce..1c7b6a39b942 100644 --- a/arch/sparc/lib/VISsave.S +++ b/arch/sparc/lib/VISsave.S | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <asm/ptrace.h> | 13 | #include <asm/ptrace.h> |
14 | #include <asm/visasm.h> | 14 | #include <asm/visasm.h> |
15 | #include <asm/thread_info.h> | 15 | #include <asm/thread_info.h> |
16 | #include <asm/export.h> | ||
16 | 17 | ||
17 | /* On entry: %o5=current FPRS value, %g7 is callers address */ | 18 | /* On entry: %o5=current FPRS value, %g7 is callers address */ |
18 | /* May clobber %o5, %g1, %g2, %g3, %g7, %icc, %xcc */ | 19 | /* May clobber %o5, %g1, %g2, %g3, %g7, %icc, %xcc */ |
@@ -79,3 +80,4 @@ vis1: ldub [%g6 + TI_FPSAVED], %g3 | |||
79 | 80: jmpl %g7 + %g0, %g0 | 80 | 80: jmpl %g7 + %g0, %g0 |
80 | nop | 81 | nop |
81 | ENDPROC(VISenter) | 82 | ENDPROC(VISenter) |
83 | EXPORT_SYMBOL(VISenter) | ||
diff --git a/arch/sparc/lib/ashldi3.S b/arch/sparc/lib/ashldi3.S index 86f60de07b0a..c8b1cf71bc73 100644 --- a/arch/sparc/lib/ashldi3.S +++ b/arch/sparc/lib/ashldi3.S | |||
@@ -6,6 +6,7 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/linkage.h> | 8 | #include <linux/linkage.h> |
9 | #include <asm/export.h> | ||
9 | 10 | ||
10 | .text | 11 | .text |
11 | ENTRY(__ashldi3) | 12 | ENTRY(__ashldi3) |
@@ -33,3 +34,4 @@ ENTRY(__ashldi3) | |||
33 | retl | 34 | retl |
34 | nop | 35 | nop |
35 | ENDPROC(__ashldi3) | 36 | ENDPROC(__ashldi3) |
37 | EXPORT_SYMBOL(__ashldi3) | ||
diff --git a/arch/sparc/lib/ashrdi3.S b/arch/sparc/lib/ashrdi3.S index 6eb8ba2dd50e..4310256e7964 100644 --- a/arch/sparc/lib/ashrdi3.S +++ b/arch/sparc/lib/ashrdi3.S | |||
@@ -6,6 +6,7 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/linkage.h> | 8 | #include <linux/linkage.h> |
9 | #include <asm/export.h> | ||
9 | 10 | ||
10 | .text | 11 | .text |
11 | ENTRY(__ashrdi3) | 12 | ENTRY(__ashrdi3) |
@@ -35,3 +36,4 @@ ENTRY(__ashrdi3) | |||
35 | jmpl %o7 + 8, %g0 | 36 | jmpl %o7 + 8, %g0 |
36 | nop | 37 | nop |
37 | ENDPROC(__ashrdi3) | 38 | ENDPROC(__ashrdi3) |
39 | EXPORT_SYMBOL(__ashrdi3) | ||
diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S index a5c5a0279ccc..1c6a1bde5138 100644 --- a/arch/sparc/lib/atomic_64.S +++ b/arch/sparc/lib/atomic_64.S | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <linux/linkage.h> | 6 | #include <linux/linkage.h> |
7 | #include <asm/asi.h> | 7 | #include <asm/asi.h> |
8 | #include <asm/backoff.h> | 8 | #include <asm/backoff.h> |
9 | #include <asm/export.h> | ||
9 | 10 | ||
10 | .text | 11 | .text |
11 | 12 | ||
@@ -29,6 +30,7 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \ | |||
29 | nop; \ | 30 | nop; \ |
30 | 2: BACKOFF_SPIN(%o2, %o3, 1b); \ | 31 | 2: BACKOFF_SPIN(%o2, %o3, 1b); \ |
31 | ENDPROC(atomic_##op); \ | 32 | ENDPROC(atomic_##op); \ |
33 | EXPORT_SYMBOL(atomic_##op); | ||
32 | 34 | ||
33 | #define ATOMIC_OP_RETURN(op) \ | 35 | #define ATOMIC_OP_RETURN(op) \ |
34 | ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \ | 36 | ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \ |
@@ -42,7 +44,8 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \ | |||
42 | retl; \ | 44 | retl; \ |
43 | sra %g1, 0, %o0; \ | 45 | sra %g1, 0, %o0; \ |
44 | 2: BACKOFF_SPIN(%o2, %o3, 1b); \ | 46 | 2: BACKOFF_SPIN(%o2, %o3, 1b); \ |
45 | ENDPROC(atomic_##op##_return); | 47 | ENDPROC(atomic_##op##_return); \ |
48 | EXPORT_SYMBOL(atomic_##op##_return); | ||
46 | 49 | ||
47 | #define ATOMIC_FETCH_OP(op) \ | 50 | #define ATOMIC_FETCH_OP(op) \ |
48 | ENTRY(atomic_fetch_##op) /* %o0 = increment, %o1 = atomic_ptr */ \ | 51 | ENTRY(atomic_fetch_##op) /* %o0 = increment, %o1 = atomic_ptr */ \ |
@@ -56,7 +59,8 @@ ENTRY(atomic_fetch_##op) /* %o0 = increment, %o1 = atomic_ptr */ \ | |||
56 | retl; \ | 59 | retl; \ |
57 | sra %g1, 0, %o0; \ | 60 | sra %g1, 0, %o0; \ |
58 | 2: BACKOFF_SPIN(%o2, %o3, 1b); \ | 61 | 2: BACKOFF_SPIN(%o2, %o3, 1b); \ |
59 | ENDPROC(atomic_fetch_##op); | 62 | ENDPROC(atomic_fetch_##op); \ |
63 | EXPORT_SYMBOL(atomic_fetch_##op); | ||
60 | 64 | ||
61 | #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op) ATOMIC_FETCH_OP(op) | 65 | #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op) ATOMIC_FETCH_OP(op) |
62 | 66 | ||
@@ -88,6 +92,7 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \ | |||
88 | nop; \ | 92 | nop; \ |
89 | 2: BACKOFF_SPIN(%o2, %o3, 1b); \ | 93 | 2: BACKOFF_SPIN(%o2, %o3, 1b); \ |
90 | ENDPROC(atomic64_##op); \ | 94 | ENDPROC(atomic64_##op); \ |
95 | EXPORT_SYMBOL(atomic64_##op); | ||
91 | 96 | ||
92 | #define ATOMIC64_OP_RETURN(op) \ | 97 | #define ATOMIC64_OP_RETURN(op) \ |
93 | ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \ | 98 | ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \ |
@@ -101,7 +106,8 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \ | |||
101 | retl; \ | 106 | retl; \ |
102 | op %g1, %o0, %o0; \ | 107 | op %g1, %o0, %o0; \ |
103 | 2: BACKOFF_SPIN(%o2, %o3, 1b); \ | 108 | 2: BACKOFF_SPIN(%o2, %o3, 1b); \ |
104 | ENDPROC(atomic64_##op##_return); | 109 | ENDPROC(atomic64_##op##_return); \ |
110 | EXPORT_SYMBOL(atomic64_##op##_return); | ||
105 | 111 | ||
106 | #define ATOMIC64_FETCH_OP(op) \ | 112 | #define ATOMIC64_FETCH_OP(op) \ |
107 | ENTRY(atomic64_fetch_##op) /* %o0 = increment, %o1 = atomic_ptr */ \ | 113 | ENTRY(atomic64_fetch_##op) /* %o0 = increment, %o1 = atomic_ptr */ \ |
@@ -115,7 +121,8 @@ ENTRY(atomic64_fetch_##op) /* %o0 = increment, %o1 = atomic_ptr */ \ | |||
115 | retl; \ | 121 | retl; \ |
116 | mov %g1, %o0; \ | 122 | mov %g1, %o0; \ |
117 | 2: BACKOFF_SPIN(%o2, %o3, 1b); \ | 123 | 2: BACKOFF_SPIN(%o2, %o3, 1b); \ |
118 | ENDPROC(atomic64_fetch_##op); | 124 | ENDPROC(atomic64_fetch_##op); \ |
125 | EXPORT_SYMBOL(atomic64_fetch_##op); | ||
119 | 126 | ||
120 | #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op) ATOMIC64_FETCH_OP(op) | 127 | #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op) ATOMIC64_FETCH_OP(op) |
121 | 128 | ||
@@ -147,3 +154,4 @@ ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */ | |||
147 | sub %g1, 1, %o0 | 154 | sub %g1, 1, %o0 |
148 | 2: BACKOFF_SPIN(%o2, %o3, 1b) | 155 | 2: BACKOFF_SPIN(%o2, %o3, 1b) |
149 | ENDPROC(atomic64_dec_if_positive) | 156 | ENDPROC(atomic64_dec_if_positive) |
157 | EXPORT_SYMBOL(atomic64_dec_if_positive) | ||
diff --git a/arch/sparc/lib/bitops.S b/arch/sparc/lib/bitops.S index 36f72cc0e67e..7031bf1587cb 100644 --- a/arch/sparc/lib/bitops.S +++ b/arch/sparc/lib/bitops.S | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <linux/linkage.h> | 6 | #include <linux/linkage.h> |
7 | #include <asm/asi.h> | 7 | #include <asm/asi.h> |
8 | #include <asm/backoff.h> | 8 | #include <asm/backoff.h> |
9 | #include <asm/export.h> | ||
9 | 10 | ||
10 | .text | 11 | .text |
11 | 12 | ||
@@ -29,6 +30,7 @@ ENTRY(test_and_set_bit) /* %o0=nr, %o1=addr */ | |||
29 | nop | 30 | nop |
30 | 2: BACKOFF_SPIN(%o3, %o4, 1b) | 31 | 2: BACKOFF_SPIN(%o3, %o4, 1b) |
31 | ENDPROC(test_and_set_bit) | 32 | ENDPROC(test_and_set_bit) |
33 | EXPORT_SYMBOL(test_and_set_bit) | ||
32 | 34 | ||
33 | ENTRY(test_and_clear_bit) /* %o0=nr, %o1=addr */ | 35 | ENTRY(test_and_clear_bit) /* %o0=nr, %o1=addr */ |
34 | BACKOFF_SETUP(%o3) | 36 | BACKOFF_SETUP(%o3) |
@@ -50,6 +52,7 @@ ENTRY(test_and_clear_bit) /* %o0=nr, %o1=addr */ | |||
50 | nop | 52 | nop |
51 | 2: BACKOFF_SPIN(%o3, %o4, 1b) | 53 | 2: BACKOFF_SPIN(%o3, %o4, 1b) |
52 | ENDPROC(test_and_clear_bit) | 54 | ENDPROC(test_and_clear_bit) |
55 | EXPORT_SYMBOL(test_and_clear_bit) | ||
53 | 56 | ||
54 | ENTRY(test_and_change_bit) /* %o0=nr, %o1=addr */ | 57 | ENTRY(test_and_change_bit) /* %o0=nr, %o1=addr */ |
55 | BACKOFF_SETUP(%o3) | 58 | BACKOFF_SETUP(%o3) |
@@ -71,6 +74,7 @@ ENTRY(test_and_change_bit) /* %o0=nr, %o1=addr */ | |||
71 | nop | 74 | nop |
72 | 2: BACKOFF_SPIN(%o3, %o4, 1b) | 75 | 2: BACKOFF_SPIN(%o3, %o4, 1b) |
73 | ENDPROC(test_and_change_bit) | 76 | ENDPROC(test_and_change_bit) |
77 | EXPORT_SYMBOL(test_and_change_bit) | ||
74 | 78 | ||
75 | ENTRY(set_bit) /* %o0=nr, %o1=addr */ | 79 | ENTRY(set_bit) /* %o0=nr, %o1=addr */ |
76 | BACKOFF_SETUP(%o3) | 80 | BACKOFF_SETUP(%o3) |
@@ -90,6 +94,7 @@ ENTRY(set_bit) /* %o0=nr, %o1=addr */ | |||
90 | nop | 94 | nop |
91 | 2: BACKOFF_SPIN(%o3, %o4, 1b) | 95 | 2: BACKOFF_SPIN(%o3, %o4, 1b) |
92 | ENDPROC(set_bit) | 96 | ENDPROC(set_bit) |
97 | EXPORT_SYMBOL(set_bit) | ||
93 | 98 | ||
94 | ENTRY(clear_bit) /* %o0=nr, %o1=addr */ | 99 | ENTRY(clear_bit) /* %o0=nr, %o1=addr */ |
95 | BACKOFF_SETUP(%o3) | 100 | BACKOFF_SETUP(%o3) |
@@ -109,6 +114,7 @@ ENTRY(clear_bit) /* %o0=nr, %o1=addr */ | |||
109 | nop | 114 | nop |
110 | 2: BACKOFF_SPIN(%o3, %o4, 1b) | 115 | 2: BACKOFF_SPIN(%o3, %o4, 1b) |
111 | ENDPROC(clear_bit) | 116 | ENDPROC(clear_bit) |
117 | EXPORT_SYMBOL(clear_bit) | ||
112 | 118 | ||
113 | ENTRY(change_bit) /* %o0=nr, %o1=addr */ | 119 | ENTRY(change_bit) /* %o0=nr, %o1=addr */ |
114 | BACKOFF_SETUP(%o3) | 120 | BACKOFF_SETUP(%o3) |
@@ -128,3 +134,4 @@ ENTRY(change_bit) /* %o0=nr, %o1=addr */ | |||
128 | nop | 134 | nop |
129 | 2: BACKOFF_SPIN(%o3, %o4, 1b) | 135 | 2: BACKOFF_SPIN(%o3, %o4, 1b) |
130 | ENDPROC(change_bit) | 136 | ENDPROC(change_bit) |
137 | EXPORT_SYMBOL(change_bit) | ||
diff --git a/arch/sparc/lib/blockops.S b/arch/sparc/lib/blockops.S index 3c771011ff4b..1f2692d59d18 100644 --- a/arch/sparc/lib/blockops.S +++ b/arch/sparc/lib/blockops.S | |||
@@ -6,6 +6,7 @@ | |||
6 | 6 | ||
7 | #include <linux/linkage.h> | 7 | #include <linux/linkage.h> |
8 | #include <asm/page.h> | 8 | #include <asm/page.h> |
9 | #include <asm/export.h> | ||
9 | 10 | ||
10 | /* Zero out 64 bytes of memory at (buf + offset). | 11 | /* Zero out 64 bytes of memory at (buf + offset). |
11 | * Assumes %g1 contains zero. | 12 | * Assumes %g1 contains zero. |
@@ -64,6 +65,7 @@ ENTRY(bzero_1page) | |||
64 | retl | 65 | retl |
65 | nop | 66 | nop |
66 | ENDPROC(bzero_1page) | 67 | ENDPROC(bzero_1page) |
68 | EXPORT_SYMBOL(bzero_1page) | ||
67 | 69 | ||
68 | ENTRY(__copy_1page) | 70 | ENTRY(__copy_1page) |
69 | /* NOTE: If you change the number of insns of this routine, please check | 71 | /* NOTE: If you change the number of insns of this routine, please check |
@@ -87,3 +89,4 @@ ENTRY(__copy_1page) | |||
87 | retl | 89 | retl |
88 | nop | 90 | nop |
89 | ENDPROC(__copy_1page) | 91 | ENDPROC(__copy_1page) |
92 | EXPORT_SYMBOL(__copy_1page) | ||
diff --git a/arch/sparc/lib/bzero.S b/arch/sparc/lib/bzero.S index 8c058114b649..3bb1914c4fa4 100644 --- a/arch/sparc/lib/bzero.S +++ b/arch/sparc/lib/bzero.S | |||
@@ -5,6 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <linux/linkage.h> | 7 | #include <linux/linkage.h> |
8 | #include <asm/export.h> | ||
8 | 9 | ||
9 | .text | 10 | .text |
10 | 11 | ||
@@ -78,6 +79,8 @@ __bzero_done: | |||
78 | mov %o3, %o0 | 79 | mov %o3, %o0 |
79 | ENDPROC(__bzero) | 80 | ENDPROC(__bzero) |
80 | ENDPROC(memset) | 81 | ENDPROC(memset) |
82 | EXPORT_SYMBOL(__bzero) | ||
83 | EXPORT_SYMBOL(memset) | ||
81 | 84 | ||
82 | #define EX_ST(x,y) \ | 85 | #define EX_ST(x,y) \ |
83 | 98: x,y; \ | 86 | 98: x,y; \ |
@@ -143,3 +146,4 @@ __clear_user_done: | |||
143 | retl | 146 | retl |
144 | clr %o0 | 147 | clr %o0 |
145 | ENDPROC(__clear_user) | 148 | ENDPROC(__clear_user) |
149 | EXPORT_SYMBOL(__clear_user) | ||
diff --git a/arch/sparc/lib/checksum_32.S b/arch/sparc/lib/checksum_32.S index 0084c3361e15..c9d8b6232111 100644 --- a/arch/sparc/lib/checksum_32.S +++ b/arch/sparc/lib/checksum_32.S | |||
@@ -14,6 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <asm/errno.h> | 16 | #include <asm/errno.h> |
17 | #include <asm/export.h> | ||
17 | 18 | ||
18 | #define CSUM_BIGCHUNK(buf, offset, sum, t0, t1, t2, t3, t4, t5) \ | 19 | #define CSUM_BIGCHUNK(buf, offset, sum, t0, t1, t2, t3, t4, t5) \ |
19 | ldd [buf + offset + 0x00], t0; \ | 20 | ldd [buf + offset + 0x00], t0; \ |
@@ -104,6 +105,7 @@ csum_partial_fix_alignment: | |||
104 | * buffer of size 0x20. Follow the code path for that case. | 105 | * buffer of size 0x20. Follow the code path for that case. |
105 | */ | 106 | */ |
106 | .globl csum_partial | 107 | .globl csum_partial |
108 | EXPORT_SYMBOL(csum_partial) | ||
107 | csum_partial: /* %o0=buf, %o1=len, %o2=sum */ | 109 | csum_partial: /* %o0=buf, %o1=len, %o2=sum */ |
108 | andcc %o0, 0x7, %g0 ! alignment problems? | 110 | andcc %o0, 0x7, %g0 ! alignment problems? |
109 | bne csum_partial_fix_alignment ! yep, handle it | 111 | bne csum_partial_fix_alignment ! yep, handle it |
@@ -335,6 +337,7 @@ cc_dword_align: | |||
335 | */ | 337 | */ |
336 | .align 8 | 338 | .align 8 |
337 | .globl __csum_partial_copy_sparc_generic | 339 | .globl __csum_partial_copy_sparc_generic |
340 | EXPORT_SYMBOL(__csum_partial_copy_sparc_generic) | ||
338 | __csum_partial_copy_sparc_generic: | 341 | __csum_partial_copy_sparc_generic: |
339 | /* %o0=src, %o1=dest, %g1=len, %g7=sum */ | 342 | /* %o0=src, %o1=dest, %g1=len, %g7=sum */ |
340 | xor %o0, %o1, %o4 ! get changing bits | 343 | xor %o0, %o1, %o4 ! get changing bits |
diff --git a/arch/sparc/lib/checksum_64.S b/arch/sparc/lib/checksum_64.S index 1d230f693dc4..f6732174fe6b 100644 --- a/arch/sparc/lib/checksum_64.S +++ b/arch/sparc/lib/checksum_64.S | |||
@@ -13,6 +13,7 @@ | |||
13 | * BSD4.4 portable checksum routine | 13 | * BSD4.4 portable checksum routine |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <asm/export.h> | ||
16 | .text | 17 | .text |
17 | 18 | ||
18 | csum_partial_fix_alignment: | 19 | csum_partial_fix_alignment: |
@@ -37,6 +38,7 @@ csum_partial_fix_alignment: | |||
37 | 38 | ||
38 | .align 32 | 39 | .align 32 |
39 | .globl csum_partial | 40 | .globl csum_partial |
41 | EXPORT_SYMBOL(csum_partial) | ||
40 | csum_partial: /* %o0=buff, %o1=len, %o2=sum */ | 42 | csum_partial: /* %o0=buff, %o1=len, %o2=sum */ |
41 | prefetch [%o0 + 0x000], #n_reads | 43 | prefetch [%o0 + 0x000], #n_reads |
42 | clr %o4 | 44 | clr %o4 |
diff --git a/arch/sparc/lib/clear_page.S b/arch/sparc/lib/clear_page.S index 46272dfc26e8..f30d6b78afbd 100644 --- a/arch/sparc/lib/clear_page.S +++ b/arch/sparc/lib/clear_page.S | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <asm/pgtable.h> | 10 | #include <asm/pgtable.h> |
11 | #include <asm/spitfire.h> | 11 | #include <asm/spitfire.h> |
12 | #include <asm/head.h> | 12 | #include <asm/head.h> |
13 | #include <asm/export.h> | ||
13 | 14 | ||
14 | /* What we used to do was lock a TLB entry into a specific | 15 | /* What we used to do was lock a TLB entry into a specific |
15 | * TLB slot, clear the page with interrupts disabled, then | 16 | * TLB slot, clear the page with interrupts disabled, then |
@@ -26,6 +27,7 @@ | |||
26 | .text | 27 | .text |
27 | 28 | ||
28 | .globl _clear_page | 29 | .globl _clear_page |
30 | EXPORT_SYMBOL(_clear_page) | ||
29 | _clear_page: /* %o0=dest */ | 31 | _clear_page: /* %o0=dest */ |
30 | ba,pt %xcc, clear_page_common | 32 | ba,pt %xcc, clear_page_common |
31 | clr %o4 | 33 | clr %o4 |
@@ -35,6 +37,7 @@ _clear_page: /* %o0=dest */ | |||
35 | */ | 37 | */ |
36 | .align 32 | 38 | .align 32 |
37 | .globl clear_user_page | 39 | .globl clear_user_page |
40 | EXPORT_SYMBOL(clear_user_page) | ||
38 | clear_user_page: /* %o0=dest, %o1=vaddr */ | 41 | clear_user_page: /* %o0=dest, %o1=vaddr */ |
39 | lduw [%g6 + TI_PRE_COUNT], %o2 | 42 | lduw [%g6 + TI_PRE_COUNT], %o2 |
40 | sethi %hi(PAGE_OFFSET), %g2 | 43 | sethi %hi(PAGE_OFFSET), %g2 |
diff --git a/arch/sparc/lib/copy_in_user.S b/arch/sparc/lib/copy_in_user.S index 302c0e60dc2c..482de093bdae 100644 --- a/arch/sparc/lib/copy_in_user.S +++ b/arch/sparc/lib/copy_in_user.S | |||
@@ -5,6 +5,7 @@ | |||
5 | 5 | ||
6 | #include <linux/linkage.h> | 6 | #include <linux/linkage.h> |
7 | #include <asm/asi.h> | 7 | #include <asm/asi.h> |
8 | #include <asm/export.h> | ||
8 | 9 | ||
9 | #define XCC xcc | 10 | #define XCC xcc |
10 | 11 | ||
@@ -90,3 +91,4 @@ ENTRY(___copy_in_user) /* %o0=dst, %o1=src, %o2=len */ | |||
90 | retl | 91 | retl |
91 | clr %o0 | 92 | clr %o0 |
92 | ENDPROC(___copy_in_user) | 93 | ENDPROC(___copy_in_user) |
94 | EXPORT_SYMBOL(___copy_in_user) | ||
diff --git a/arch/sparc/lib/copy_page.S b/arch/sparc/lib/copy_page.S index dd16c61f3263..7197b7250895 100644 --- a/arch/sparc/lib/copy_page.S +++ b/arch/sparc/lib/copy_page.S | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <asm/pgtable.h> | 10 | #include <asm/pgtable.h> |
11 | #include <asm/spitfire.h> | 11 | #include <asm/spitfire.h> |
12 | #include <asm/head.h> | 12 | #include <asm/head.h> |
13 | #include <asm/export.h> | ||
13 | 14 | ||
14 | /* What we used to do was lock a TLB entry into a specific | 15 | /* What we used to do was lock a TLB entry into a specific |
15 | * TLB slot, clear the page with interrupts disabled, then | 16 | * TLB slot, clear the page with interrupts disabled, then |
@@ -44,6 +45,7 @@ | |||
44 | .align 32 | 45 | .align 32 |
45 | .globl copy_user_page | 46 | .globl copy_user_page |
46 | .type copy_user_page,#function | 47 | .type copy_user_page,#function |
48 | EXPORT_SYMBOL(copy_user_page) | ||
47 | copy_user_page: /* %o0=dest, %o1=src, %o2=vaddr */ | 49 | copy_user_page: /* %o0=dest, %o1=src, %o2=vaddr */ |
48 | lduw [%g6 + TI_PRE_COUNT], %o4 | 50 | lduw [%g6 + TI_PRE_COUNT], %o4 |
49 | sethi %hi(PAGE_OFFSET), %g2 | 51 | sethi %hi(PAGE_OFFSET), %g2 |
diff --git a/arch/sparc/lib/copy_user.S b/arch/sparc/lib/copy_user.S index ef095b6c43b1..cea644dc67a6 100644 --- a/arch/sparc/lib/copy_user.S +++ b/arch/sparc/lib/copy_user.S | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <asm/asmmacro.h> | 15 | #include <asm/asmmacro.h> |
16 | #include <asm/page.h> | 16 | #include <asm/page.h> |
17 | #include <asm/thread_info.h> | 17 | #include <asm/thread_info.h> |
18 | #include <asm/export.h> | ||
18 | 19 | ||
19 | /* Work around cpp -rob */ | 20 | /* Work around cpp -rob */ |
20 | #define ALLOC #alloc | 21 | #define ALLOC #alloc |
@@ -119,6 +120,7 @@ | |||
119 | __copy_user_begin: | 120 | __copy_user_begin: |
120 | 121 | ||
121 | .globl __copy_user | 122 | .globl __copy_user |
123 | EXPORT_SYMBOL(__copy_user) | ||
122 | dword_align: | 124 | dword_align: |
123 | andcc %o1, 1, %g0 | 125 | andcc %o1, 1, %g0 |
124 | be 4f | 126 | be 4f |
diff --git a/arch/sparc/lib/csum_copy.S b/arch/sparc/lib/csum_copy.S index e566c770a0f6..0ecbafc30fd0 100644 --- a/arch/sparc/lib/csum_copy.S +++ b/arch/sparc/lib/csum_copy.S | |||
@@ -3,6 +3,8 @@ | |||
3 | * Copyright (C) 2005 David S. Miller <davem@davemloft.net> | 3 | * Copyright (C) 2005 David S. Miller <davem@davemloft.net> |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <asm/export.h> | ||
7 | |||
6 | #ifdef __KERNEL__ | 8 | #ifdef __KERNEL__ |
7 | #define GLOBAL_SPARE %g7 | 9 | #define GLOBAL_SPARE %g7 |
8 | #else | 10 | #else |
@@ -63,6 +65,7 @@ | |||
63 | add %o5, %o4, %o4 | 65 | add %o5, %o4, %o4 |
64 | 66 | ||
65 | .globl FUNC_NAME | 67 | .globl FUNC_NAME |
68 | EXPORT_SYMBOL(FUNC_NAME) | ||
66 | FUNC_NAME: /* %o0=src, %o1=dst, %o2=len, %o3=sum */ | 69 | FUNC_NAME: /* %o0=src, %o1=dst, %o2=len, %o3=sum */ |
67 | LOAD(prefetch, %o0 + 0x000, #n_reads) | 70 | LOAD(prefetch, %o0 + 0x000, #n_reads) |
68 | xor %o0, %o1, %g1 | 71 | xor %o0, %o1, %g1 |
diff --git a/arch/sparc/lib/divdi3.S b/arch/sparc/lib/divdi3.S index 9614b48b6ef8..a2b5a976be33 100644 --- a/arch/sparc/lib/divdi3.S +++ b/arch/sparc/lib/divdi3.S | |||
@@ -17,6 +17,7 @@ along with GNU CC; see the file COPYING. If not, write to | |||
17 | the Free Software Foundation, 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. */ | 18 | Boston, MA 02111-1307, USA. */ |
19 | 19 | ||
20 | #include <asm/export.h> | ||
20 | .text | 21 | .text |
21 | .align 4 | 22 | .align 4 |
22 | .globl __divdi3 | 23 | .globl __divdi3 |
@@ -279,3 +280,4 @@ __divdi3: | |||
279 | .LL81: | 280 | .LL81: |
280 | ret | 281 | ret |
281 | restore | 282 | restore |
283 | EXPORT_SYMBOL(__divdi3) | ||
diff --git a/arch/sparc/lib/ffs.S b/arch/sparc/lib/ffs.S index b39389f69899..23aab144d28e 100644 --- a/arch/sparc/lib/ffs.S +++ b/arch/sparc/lib/ffs.S | |||
@@ -1,4 +1,5 @@ | |||
1 | #include <linux/linkage.h> | 1 | #include <linux/linkage.h> |
2 | #include <asm/export.h> | ||
2 | 3 | ||
3 | .register %g2,#scratch | 4 | .register %g2,#scratch |
4 | 5 | ||
@@ -65,6 +66,8 @@ ENTRY(__ffs) | |||
65 | add %o2, %g1, %o0 | 66 | add %o2, %g1, %o0 |
66 | ENDPROC(ffs) | 67 | ENDPROC(ffs) |
67 | ENDPROC(__ffs) | 68 | ENDPROC(__ffs) |
69 | EXPORT_SYMBOL(__ffs) | ||
70 | EXPORT_SYMBOL(ffs) | ||
68 | 71 | ||
69 | .section .popc_6insn_patch, "ax" | 72 | .section .popc_6insn_patch, "ax" |
70 | .word ffs | 73 | .word ffs |
diff --git a/arch/sparc/lib/hweight.S b/arch/sparc/lib/hweight.S index 95414e0a6808..f9985f129fb6 100644 --- a/arch/sparc/lib/hweight.S +++ b/arch/sparc/lib/hweight.S | |||
@@ -1,4 +1,5 @@ | |||
1 | #include <linux/linkage.h> | 1 | #include <linux/linkage.h> |
2 | #include <asm/export.h> | ||
2 | 3 | ||
3 | .text | 4 | .text |
4 | .align 32 | 5 | .align 32 |
@@ -7,6 +8,7 @@ ENTRY(__arch_hweight8) | |||
7 | nop | 8 | nop |
8 | nop | 9 | nop |
9 | ENDPROC(__arch_hweight8) | 10 | ENDPROC(__arch_hweight8) |
11 | EXPORT_SYMBOL(__arch_hweight8) | ||
10 | .section .popc_3insn_patch, "ax" | 12 | .section .popc_3insn_patch, "ax" |
11 | .word __arch_hweight8 | 13 | .word __arch_hweight8 |
12 | sllx %o0, 64-8, %g1 | 14 | sllx %o0, 64-8, %g1 |
@@ -19,6 +21,7 @@ ENTRY(__arch_hweight16) | |||
19 | nop | 21 | nop |
20 | nop | 22 | nop |
21 | ENDPROC(__arch_hweight16) | 23 | ENDPROC(__arch_hweight16) |
24 | EXPORT_SYMBOL(__arch_hweight16) | ||
22 | .section .popc_3insn_patch, "ax" | 25 | .section .popc_3insn_patch, "ax" |
23 | .word __arch_hweight16 | 26 | .word __arch_hweight16 |
24 | sllx %o0, 64-16, %g1 | 27 | sllx %o0, 64-16, %g1 |
@@ -31,6 +34,7 @@ ENTRY(__arch_hweight32) | |||
31 | nop | 34 | nop |
32 | nop | 35 | nop |
33 | ENDPROC(__arch_hweight32) | 36 | ENDPROC(__arch_hweight32) |
37 | EXPORT_SYMBOL(__arch_hweight32) | ||
34 | .section .popc_3insn_patch, "ax" | 38 | .section .popc_3insn_patch, "ax" |
35 | .word __arch_hweight32 | 39 | .word __arch_hweight32 |
36 | sllx %o0, 64-32, %g1 | 40 | sllx %o0, 64-32, %g1 |
@@ -43,6 +47,7 @@ ENTRY(__arch_hweight64) | |||
43 | nop | 47 | nop |
44 | nop | 48 | nop |
45 | ENDPROC(__arch_hweight64) | 49 | ENDPROC(__arch_hweight64) |
50 | EXPORT_SYMBOL(__arch_hweight64) | ||
46 | .section .popc_3insn_patch, "ax" | 51 | .section .popc_3insn_patch, "ax" |
47 | .word __arch_hweight64 | 52 | .word __arch_hweight64 |
48 | retl | 53 | retl |
diff --git a/arch/sparc/lib/ipcsum.S b/arch/sparc/lib/ipcsum.S index 4742d59029ee..5d61648b53dd 100644 --- a/arch/sparc/lib/ipcsum.S +++ b/arch/sparc/lib/ipcsum.S | |||
@@ -1,4 +1,5 @@ | |||
1 | #include <linux/linkage.h> | 1 | #include <linux/linkage.h> |
2 | #include <asm/export.h> | ||
2 | 3 | ||
3 | .text | 4 | .text |
4 | ENTRY(ip_fast_csum) /* %o0 = iph, %o1 = ihl */ | 5 | ENTRY(ip_fast_csum) /* %o0 = iph, %o1 = ihl */ |
@@ -31,3 +32,4 @@ ENTRY(ip_fast_csum) /* %o0 = iph, %o1 = ihl */ | |||
31 | retl | 32 | retl |
32 | and %o2, %o1, %o0 | 33 | and %o2, %o1, %o0 |
33 | ENDPROC(ip_fast_csum) | 34 | ENDPROC(ip_fast_csum) |
35 | EXPORT_SYMBOL(ip_fast_csum) | ||
diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c deleted file mode 100644 index de5e97817bdb..000000000000 --- a/arch/sparc/lib/ksyms.c +++ /dev/null | |||
@@ -1,174 +0,0 @@ | |||
1 | /* | ||
2 | * Export of symbols defined in assembler | ||
3 | */ | ||
4 | |||
5 | /* Tell string.h we don't want memcpy etc. as cpp defines */ | ||
6 | #define EXPORT_SYMTAB_STROPS | ||
7 | |||
8 | #include <linux/module.h> | ||
9 | #include <linux/string.h> | ||
10 | #include <linux/types.h> | ||
11 | |||
12 | #include <asm/checksum.h> | ||
13 | #include <asm/uaccess.h> | ||
14 | #include <asm/ftrace.h> | ||
15 | |||
16 | /* string functions */ | ||
17 | EXPORT_SYMBOL(strlen); | ||
18 | EXPORT_SYMBOL(strncmp); | ||
19 | |||
20 | /* mem* functions */ | ||
21 | extern void *__memscan_zero(void *, size_t); | ||
22 | extern void *__memscan_generic(void *, int, size_t); | ||
23 | extern void *__bzero(void *, size_t); | ||
24 | |||
25 | EXPORT_SYMBOL(memscan); | ||
26 | EXPORT_SYMBOL(__memscan_zero); | ||
27 | EXPORT_SYMBOL(__memscan_generic); | ||
28 | EXPORT_SYMBOL(memcmp); | ||
29 | EXPORT_SYMBOL(memcpy); | ||
30 | EXPORT_SYMBOL(memset); | ||
31 | EXPORT_SYMBOL(memmove); | ||
32 | EXPORT_SYMBOL(__bzero); | ||
33 | |||
34 | /* Networking helper routines. */ | ||
35 | EXPORT_SYMBOL(csum_partial); | ||
36 | |||
37 | #ifdef CONFIG_MCOUNT | ||
38 | EXPORT_SYMBOL(_mcount); | ||
39 | #endif | ||
40 | |||
41 | /* | ||
42 | * sparc | ||
43 | */ | ||
44 | #ifdef CONFIG_SPARC32 | ||
45 | extern int __ashrdi3(int, int); | ||
46 | extern int __ashldi3(int, int); | ||
47 | extern int __lshrdi3(int, int); | ||
48 | extern int __muldi3(int, int); | ||
49 | extern int __divdi3(int, int); | ||
50 | |||
51 | extern void (*__copy_1page)(void *, const void *); | ||
52 | extern void (*bzero_1page)(void *); | ||
53 | |||
54 | extern void ___rw_read_enter(void); | ||
55 | extern void ___rw_read_try(void); | ||
56 | extern void ___rw_read_exit(void); | ||
57 | extern void ___rw_write_enter(void); | ||
58 | |||
59 | /* Networking helper routines. */ | ||
60 | EXPORT_SYMBOL(__csum_partial_copy_sparc_generic); | ||
61 | |||
62 | /* Special internal versions of library functions. */ | ||
63 | EXPORT_SYMBOL(__copy_1page); | ||
64 | EXPORT_SYMBOL(__memmove); | ||
65 | EXPORT_SYMBOL(bzero_1page); | ||
66 | |||
67 | /* Moving data to/from/in userspace. */ | ||
68 | EXPORT_SYMBOL(__copy_user); | ||
69 | |||
70 | /* Used by asm/spinlock.h */ | ||
71 | #ifdef CONFIG_SMP | ||
72 | EXPORT_SYMBOL(___rw_read_enter); | ||
73 | EXPORT_SYMBOL(___rw_read_try); | ||
74 | EXPORT_SYMBOL(___rw_read_exit); | ||
75 | EXPORT_SYMBOL(___rw_write_enter); | ||
76 | #endif | ||
77 | |||
78 | EXPORT_SYMBOL(__ashrdi3); | ||
79 | EXPORT_SYMBOL(__ashldi3); | ||
80 | EXPORT_SYMBOL(__lshrdi3); | ||
81 | EXPORT_SYMBOL(__muldi3); | ||
82 | EXPORT_SYMBOL(__divdi3); | ||
83 | #endif | ||
84 | |||
85 | /* | ||
86 | * sparc64 | ||
87 | */ | ||
88 | #ifdef CONFIG_SPARC64 | ||
89 | /* Networking helper routines. */ | ||
90 | EXPORT_SYMBOL(csum_partial_copy_nocheck); | ||
91 | EXPORT_SYMBOL(__csum_partial_copy_from_user); | ||
92 | EXPORT_SYMBOL(__csum_partial_copy_to_user); | ||
93 | EXPORT_SYMBOL(ip_fast_csum); | ||
94 | |||
95 | /* Moving data to/from/in userspace. */ | ||
96 | EXPORT_SYMBOL(___copy_to_user); | ||
97 | EXPORT_SYMBOL(___copy_from_user); | ||
98 | EXPORT_SYMBOL(___copy_in_user); | ||
99 | EXPORT_SYMBOL(__clear_user); | ||
100 | |||
101 | /* Atomic counter implementation. */ | ||
102 | #define ATOMIC_OP(op) \ | ||
103 | EXPORT_SYMBOL(atomic_##op); \ | ||
104 | EXPORT_SYMBOL(atomic64_##op); | ||
105 | |||
106 | #define ATOMIC_OP_RETURN(op) \ | ||
107 | EXPORT_SYMBOL(atomic_##op##_return); \ | ||
108 | EXPORT_SYMBOL(atomic64_##op##_return); | ||
109 | |||
110 | #define ATOMIC_FETCH_OP(op) \ | ||
111 | EXPORT_SYMBOL(atomic_fetch_##op); \ | ||
112 | EXPORT_SYMBOL(atomic64_fetch_##op); | ||
113 | |||
114 | #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op) ATOMIC_FETCH_OP(op) | ||
115 | |||
116 | ATOMIC_OPS(add) | ||
117 | ATOMIC_OPS(sub) | ||
118 | |||
119 | #undef ATOMIC_OPS | ||
120 | #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_FETCH_OP(op) | ||
121 | |||
122 | ATOMIC_OPS(and) | ||
123 | ATOMIC_OPS(or) | ||
124 | ATOMIC_OPS(xor) | ||
125 | |||
126 | #undef ATOMIC_OPS | ||
127 | #undef ATOMIC_FETCH_OP | ||
128 | #undef ATOMIC_OP_RETURN | ||
129 | #undef ATOMIC_OP | ||
130 | |||
131 | EXPORT_SYMBOL(atomic64_dec_if_positive); | ||
132 | |||
133 | /* Atomic bit operations. */ | ||
134 | EXPORT_SYMBOL(test_and_set_bit); | ||
135 | EXPORT_SYMBOL(test_and_clear_bit); | ||
136 | EXPORT_SYMBOL(test_and_change_bit); | ||
137 | EXPORT_SYMBOL(set_bit); | ||
138 | EXPORT_SYMBOL(clear_bit); | ||
139 | EXPORT_SYMBOL(change_bit); | ||
140 | |||
141 | /* Special internal versions of library functions. */ | ||
142 | EXPORT_SYMBOL(_clear_page); | ||
143 | EXPORT_SYMBOL(clear_user_page); | ||
144 | EXPORT_SYMBOL(copy_user_page); | ||
145 | |||
146 | /* RAID code needs this */ | ||
147 | void VISenter(void); | ||
148 | EXPORT_SYMBOL(VISenter); | ||
149 | |||
150 | extern void xor_vis_2(unsigned long, unsigned long *, unsigned long *); | ||
151 | extern void xor_vis_3(unsigned long, unsigned long *, unsigned long *, | ||
152 | unsigned long *); | ||
153 | extern void xor_vis_4(unsigned long, unsigned long *, unsigned long *, | ||
154 | unsigned long *, unsigned long *); | ||
155 | extern void xor_vis_5(unsigned long, unsigned long *, unsigned long *, | ||
156 | unsigned long *, unsigned long *, unsigned long *); | ||
157 | EXPORT_SYMBOL(xor_vis_2); | ||
158 | EXPORT_SYMBOL(xor_vis_3); | ||
159 | EXPORT_SYMBOL(xor_vis_4); | ||
160 | EXPORT_SYMBOL(xor_vis_5); | ||
161 | |||
162 | extern void xor_niagara_2(unsigned long, unsigned long *, unsigned long *); | ||
163 | extern void xor_niagara_3(unsigned long, unsigned long *, unsigned long *, | ||
164 | unsigned long *); | ||
165 | extern void xor_niagara_4(unsigned long, unsigned long *, unsigned long *, | ||
166 | unsigned long *, unsigned long *); | ||
167 | extern void xor_niagara_5(unsigned long, unsigned long *, unsigned long *, | ||
168 | unsigned long *, unsigned long *, unsigned long *); | ||
169 | |||
170 | EXPORT_SYMBOL(xor_niagara_2); | ||
171 | EXPORT_SYMBOL(xor_niagara_3); | ||
172 | EXPORT_SYMBOL(xor_niagara_4); | ||
173 | EXPORT_SYMBOL(xor_niagara_5); | ||
174 | #endif | ||
diff --git a/arch/sparc/lib/locks.S b/arch/sparc/lib/locks.S index 64f53f2b673d..f38c4e59d078 100644 --- a/arch/sparc/lib/locks.S +++ b/arch/sparc/lib/locks.S | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <asm/psr.h> | 10 | #include <asm/psr.h> |
11 | #include <asm/smp.h> | 11 | #include <asm/smp.h> |
12 | #include <asm/spinlock.h> | 12 | #include <asm/spinlock.h> |
13 | #include <asm/export.h> | ||
13 | 14 | ||
14 | .text | 15 | .text |
15 | .align 4 | 16 | .align 4 |
@@ -48,6 +49,7 @@ ___rw_write_enter_spin_on_wlock: | |||
48 | ld [%g1], %g2 | 49 | ld [%g1], %g2 |
49 | 50 | ||
50 | .globl ___rw_read_enter | 51 | .globl ___rw_read_enter |
52 | EXPORT_SYMBOL(___rw_read_enter) | ||
51 | ___rw_read_enter: | 53 | ___rw_read_enter: |
52 | orcc %g2, 0x0, %g0 | 54 | orcc %g2, 0x0, %g0 |
53 | bne,a ___rw_read_enter_spin_on_wlock | 55 | bne,a ___rw_read_enter_spin_on_wlock |
@@ -59,6 +61,7 @@ ___rw_read_enter: | |||
59 | mov %g4, %o7 | 61 | mov %g4, %o7 |
60 | 62 | ||
61 | .globl ___rw_read_exit | 63 | .globl ___rw_read_exit |
64 | EXPORT_SYMBOL(___rw_read_exit) | ||
62 | ___rw_read_exit: | 65 | ___rw_read_exit: |
63 | orcc %g2, 0x0, %g0 | 66 | orcc %g2, 0x0, %g0 |
64 | bne,a ___rw_read_exit_spin_on_wlock | 67 | bne,a ___rw_read_exit_spin_on_wlock |
@@ -70,6 +73,7 @@ ___rw_read_exit: | |||
70 | mov %g4, %o7 | 73 | mov %g4, %o7 |
71 | 74 | ||
72 | .globl ___rw_read_try | 75 | .globl ___rw_read_try |
76 | EXPORT_SYMBOL(___rw_read_try) | ||
73 | ___rw_read_try: | 77 | ___rw_read_try: |
74 | orcc %g2, 0x0, %g0 | 78 | orcc %g2, 0x0, %g0 |
75 | bne ___rw_read_try_spin_on_wlock | 79 | bne ___rw_read_try_spin_on_wlock |
@@ -81,6 +85,7 @@ ___rw_read_try: | |||
81 | mov %g4, %o7 | 85 | mov %g4, %o7 |
82 | 86 | ||
83 | .globl ___rw_write_enter | 87 | .globl ___rw_write_enter |
88 | EXPORT_SYMBOL(___rw_write_enter) | ||
84 | ___rw_write_enter: | 89 | ___rw_write_enter: |
85 | orcc %g2, 0x0, %g0 | 90 | orcc %g2, 0x0, %g0 |
86 | bne ___rw_write_enter_spin_on_wlock | 91 | bne ___rw_write_enter_spin_on_wlock |
diff --git a/arch/sparc/lib/lshrdi3.S b/arch/sparc/lib/lshrdi3.S index 60ebc7cdbee0..c9b9373f8d81 100644 --- a/arch/sparc/lib/lshrdi3.S +++ b/arch/sparc/lib/lshrdi3.S | |||
@@ -1,4 +1,5 @@ | |||
1 | #include <linux/linkage.h> | 1 | #include <linux/linkage.h> |
2 | #include <asm/export.h> | ||
2 | 3 | ||
3 | ENTRY(__lshrdi3) | 4 | ENTRY(__lshrdi3) |
4 | cmp %o2, 0 | 5 | cmp %o2, 0 |
@@ -25,3 +26,4 @@ ENTRY(__lshrdi3) | |||
25 | retl | 26 | retl |
26 | nop | 27 | nop |
27 | ENDPROC(__lshrdi3) | 28 | ENDPROC(__lshrdi3) |
29 | EXPORT_SYMBOL(__lshrdi3) | ||
diff --git a/arch/sparc/lib/mcount.S b/arch/sparc/lib/mcount.S index 0b0ed4d34219..194f383611c0 100644 --- a/arch/sparc/lib/mcount.S +++ b/arch/sparc/lib/mcount.S | |||
@@ -6,6 +6,7 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/linkage.h> | 8 | #include <linux/linkage.h> |
9 | #include <asm/export.h> | ||
9 | 10 | ||
10 | /* | 11 | /* |
11 | * This is the main variant and is called by C code. GCC's -pg option | 12 | * This is the main variant and is called by C code. GCC's -pg option |
@@ -16,6 +17,7 @@ | |||
16 | .align 32 | 17 | .align 32 |
17 | .globl _mcount | 18 | .globl _mcount |
18 | .type _mcount,#function | 19 | .type _mcount,#function |
20 | EXPORT_SYMBOL(_mcount) | ||
19 | .globl mcount | 21 | .globl mcount |
20 | .type mcount,#function | 22 | .type mcount,#function |
21 | _mcount: | 23 | _mcount: |
diff --git a/arch/sparc/lib/memcmp.S b/arch/sparc/lib/memcmp.S index efa106c41ed0..cee7f30dbb61 100644 --- a/arch/sparc/lib/memcmp.S +++ b/arch/sparc/lib/memcmp.S | |||
@@ -6,6 +6,7 @@ | |||
6 | 6 | ||
7 | #include <linux/linkage.h> | 7 | #include <linux/linkage.h> |
8 | #include <asm/asm.h> | 8 | #include <asm/asm.h> |
9 | #include <asm/export.h> | ||
9 | 10 | ||
10 | .text | 11 | .text |
11 | ENTRY(memcmp) | 12 | ENTRY(memcmp) |
@@ -25,3 +26,4 @@ ENTRY(memcmp) | |||
25 | 2: retl | 26 | 2: retl |
26 | mov 0, %o0 | 27 | mov 0, %o0 |
27 | ENDPROC(memcmp) | 28 | ENDPROC(memcmp) |
29 | EXPORT_SYMBOL(memcmp) | ||
diff --git a/arch/sparc/lib/memcpy.S b/arch/sparc/lib/memcpy.S index 4d8c497517bd..1dc8ec5b6bd9 100644 --- a/arch/sparc/lib/memcpy.S +++ b/arch/sparc/lib/memcpy.S | |||
@@ -7,6 +7,7 @@ | |||
7 | * Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 7 | * Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <asm/export.h> | ||
10 | #define FUNC(x) \ | 11 | #define FUNC(x) \ |
11 | .globl x; \ | 12 | .globl x; \ |
12 | .type x,@function; \ | 13 | .type x,@function; \ |
@@ -143,8 +144,10 @@ x: | |||
143 | #ifdef __KERNEL__ | 144 | #ifdef __KERNEL__ |
144 | FUNC(amemmove) | 145 | FUNC(amemmove) |
145 | FUNC(__memmove) | 146 | FUNC(__memmove) |
147 | EXPORT_SYMBOL(__memmove) | ||
146 | #endif | 148 | #endif |
147 | FUNC(memmove) | 149 | FUNC(memmove) |
150 | EXPORT_SYMBOL(memmove) | ||
148 | cmp %o0, %o1 | 151 | cmp %o0, %o1 |
149 | mov %o0, %g7 | 152 | mov %o0, %g7 |
150 | bleu 9f | 153 | bleu 9f |
@@ -202,6 +205,7 @@ FUNC(memmove) | |||
202 | add %o0, 2, %o0 | 205 | add %o0, 2, %o0 |
203 | 206 | ||
204 | FUNC(memcpy) /* %o0=dst %o1=src %o2=len */ | 207 | FUNC(memcpy) /* %o0=dst %o1=src %o2=len */ |
208 | EXPORT_SYMBOL(memcpy) | ||
205 | 209 | ||
206 | sub %o0, %o1, %o4 | 210 | sub %o0, %o1, %o4 |
207 | mov %o0, %g7 | 211 | mov %o0, %g7 |
diff --git a/arch/sparc/lib/memmove.S b/arch/sparc/lib/memmove.S index 857ad4f8905f..012cdb6ca467 100644 --- a/arch/sparc/lib/memmove.S +++ b/arch/sparc/lib/memmove.S | |||
@@ -5,6 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <linux/linkage.h> | 7 | #include <linux/linkage.h> |
8 | #include <asm/export.h> | ||
8 | 9 | ||
9 | .text | 10 | .text |
10 | ENTRY(memmove) /* o0=dst o1=src o2=len */ | 11 | ENTRY(memmove) /* o0=dst o1=src o2=len */ |
@@ -57,3 +58,4 @@ ENTRY(memmove) /* o0=dst o1=src o2=len */ | |||
57 | stb %g7, [%o0 - 0x1] | 58 | stb %g7, [%o0 - 0x1] |
58 | ba,a,pt %xcc, 99b | 59 | ba,a,pt %xcc, 99b |
59 | ENDPROC(memmove) | 60 | ENDPROC(memmove) |
61 | EXPORT_SYMBOL(memmove) | ||
diff --git a/arch/sparc/lib/memscan_32.S b/arch/sparc/lib/memscan_32.S index 4ff1657dfc24..51ce690c42a8 100644 --- a/arch/sparc/lib/memscan_32.S +++ b/arch/sparc/lib/memscan_32.S | |||
@@ -4,6 +4,8 @@ | |||
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <asm/export.h> | ||
8 | |||
7 | /* In essence, this is just a fancy strlen. */ | 9 | /* In essence, this is just a fancy strlen. */ |
8 | 10 | ||
9 | #define LO_MAGIC 0x01010101 | 11 | #define LO_MAGIC 0x01010101 |
@@ -13,6 +15,8 @@ | |||
13 | .align 4 | 15 | .align 4 |
14 | .globl __memscan_zero, __memscan_generic | 16 | .globl __memscan_zero, __memscan_generic |
15 | .globl memscan | 17 | .globl memscan |
18 | EXPORT_SYMBOL(__memscan_zero) | ||
19 | EXPORT_SYMBOL(__memscan_generic) | ||
16 | __memscan_zero: | 20 | __memscan_zero: |
17 | /* %o0 = addr, %o1 = size */ | 21 | /* %o0 = addr, %o1 = size */ |
18 | cmp %o1, 0 | 22 | cmp %o1, 0 |
diff --git a/arch/sparc/lib/memscan_64.S b/arch/sparc/lib/memscan_64.S index 5686dfa5dc15..daa96f4b03e6 100644 --- a/arch/sparc/lib/memscan_64.S +++ b/arch/sparc/lib/memscan_64.S | |||
@@ -5,6 +5,8 @@ | |||
5 | * Copyright (C) 1998 David S. Miller (davem@redhat.com) | 5 | * Copyright (C) 1998 David S. Miller (davem@redhat.com) |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <asm/export.h> | ||
9 | |||
8 | #define HI_MAGIC 0x8080808080808080 | 10 | #define HI_MAGIC 0x8080808080808080 |
9 | #define LO_MAGIC 0x0101010101010101 | 11 | #define LO_MAGIC 0x0101010101010101 |
10 | #define ASI_PL 0x88 | 12 | #define ASI_PL 0x88 |
@@ -13,6 +15,8 @@ | |||
13 | .align 32 | 15 | .align 32 |
14 | .globl __memscan_zero, __memscan_generic | 16 | .globl __memscan_zero, __memscan_generic |
15 | .globl memscan | 17 | .globl memscan |
18 | EXPORT_SYMBOL(__memscan_zero) | ||
19 | EXPORT_SYMBOL(__memscan_generic) | ||
16 | 20 | ||
17 | __memscan_zero: | 21 | __memscan_zero: |
18 | /* %o0 = bufp, %o1 = size */ | 22 | /* %o0 = bufp, %o1 = size */ |
diff --git a/arch/sparc/lib/memset.S b/arch/sparc/lib/memset.S index f75e6906df14..bb539b42b088 100644 --- a/arch/sparc/lib/memset.S +++ b/arch/sparc/lib/memset.S | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <asm/ptrace.h> | 11 | #include <asm/ptrace.h> |
12 | #include <asm/export.h> | ||
12 | 13 | ||
13 | /* Work around cpp -rob */ | 14 | /* Work around cpp -rob */ |
14 | #define ALLOC #alloc | 15 | #define ALLOC #alloc |
@@ -63,6 +64,8 @@ __bzero_begin: | |||
63 | 64 | ||
64 | .globl __bzero | 65 | .globl __bzero |
65 | .globl memset | 66 | .globl memset |
67 | EXPORT_SYMBOL(__bzero) | ||
68 | EXPORT_SYMBOL(memset) | ||
66 | .globl __memset_start, __memset_end | 69 | .globl __memset_start, __memset_end |
67 | __memset_start: | 70 | __memset_start: |
68 | memset: | 71 | memset: |
diff --git a/arch/sparc/lib/muldi3.S b/arch/sparc/lib/muldi3.S index 9794939d1c12..17a0f49aef3c 100644 --- a/arch/sparc/lib/muldi3.S +++ b/arch/sparc/lib/muldi3.S | |||
@@ -17,6 +17,7 @@ along with GNU CC; see the file COPYING. If not, write to | |||
17 | the Free Software Foundation, 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. */ | 18 | Boston, MA 02111-1307, USA. */ |
19 | 19 | ||
20 | #include <asm/export.h> | ||
20 | .text | 21 | .text |
21 | .align 4 | 22 | .align 4 |
22 | .globl __muldi3 | 23 | .globl __muldi3 |
@@ -74,3 +75,4 @@ __muldi3: | |||
74 | add %l2, %l0, %i0 | 75 | add %l2, %l0, %i0 |
75 | ret | 76 | ret |
76 | restore %g0, %l3, %o1 | 77 | restore %g0, %l3, %o1 |
78 | EXPORT_SYMBOL(__muldi3) | ||
diff --git a/arch/sparc/lib/strlen.S b/arch/sparc/lib/strlen.S index 536f83507fbf..ca0e7077e871 100644 --- a/arch/sparc/lib/strlen.S +++ b/arch/sparc/lib/strlen.S | |||
@@ -7,6 +7,7 @@ | |||
7 | 7 | ||
8 | #include <linux/linkage.h> | 8 | #include <linux/linkage.h> |
9 | #include <asm/asm.h> | 9 | #include <asm/asm.h> |
10 | #include <asm/export.h> | ||
10 | 11 | ||
11 | #define LO_MAGIC 0x01010101 | 12 | #define LO_MAGIC 0x01010101 |
12 | #define HI_MAGIC 0x80808080 | 13 | #define HI_MAGIC 0x80808080 |
@@ -78,3 +79,4 @@ ENTRY(strlen) | |||
78 | retl | 79 | retl |
79 | mov 2, %o0 | 80 | mov 2, %o0 |
80 | ENDPROC(strlen) | 81 | ENDPROC(strlen) |
82 | EXPORT_SYMBOL(strlen) | ||
diff --git a/arch/sparc/lib/strncmp_32.S b/arch/sparc/lib/strncmp_32.S index c0d1b568c1c5..e3fe014813af 100644 --- a/arch/sparc/lib/strncmp_32.S +++ b/arch/sparc/lib/strncmp_32.S | |||
@@ -4,6 +4,7 @@ | |||
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <linux/linkage.h> | 6 | #include <linux/linkage.h> |
7 | #include <asm/export.h> | ||
7 | 8 | ||
8 | .text | 9 | .text |
9 | ENTRY(strncmp) | 10 | ENTRY(strncmp) |
@@ -116,3 +117,4 @@ ENTRY(strncmp) | |||
116 | retl | 117 | retl |
117 | sub %o3, %o0, %o0 | 118 | sub %o3, %o0, %o0 |
118 | ENDPROC(strncmp) | 119 | ENDPROC(strncmp) |
120 | EXPORT_SYMBOL(strncmp) | ||
diff --git a/arch/sparc/lib/strncmp_64.S b/arch/sparc/lib/strncmp_64.S index 0656627166f3..efb5f884330d 100644 --- a/arch/sparc/lib/strncmp_64.S +++ b/arch/sparc/lib/strncmp_64.S | |||
@@ -6,6 +6,7 @@ | |||
6 | 6 | ||
7 | #include <linux/linkage.h> | 7 | #include <linux/linkage.h> |
8 | #include <asm/asi.h> | 8 | #include <asm/asi.h> |
9 | #include <asm/export.h> | ||
9 | 10 | ||
10 | .text | 11 | .text |
11 | ENTRY(strncmp) | 12 | ENTRY(strncmp) |
@@ -28,3 +29,4 @@ ENTRY(strncmp) | |||
28 | retl | 29 | retl |
29 | clr %o0 | 30 | clr %o0 |
30 | ENDPROC(strncmp) | 31 | ENDPROC(strncmp) |
32 | EXPORT_SYMBOL(strncmp) | ||
diff --git a/arch/sparc/lib/xor.S b/arch/sparc/lib/xor.S index 2c05641c3263..45a49cb618b5 100644 --- a/arch/sparc/lib/xor.S +++ b/arch/sparc/lib/xor.S | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <asm/asi.h> | 13 | #include <asm/asi.h> |
14 | #include <asm/dcu.h> | 14 | #include <asm/dcu.h> |
15 | #include <asm/spitfire.h> | 15 | #include <asm/spitfire.h> |
16 | #include <asm/export.h> | ||
16 | 17 | ||
17 | /* | 18 | /* |
18 | * Requirements: | 19 | * Requirements: |
@@ -90,6 +91,7 @@ ENTRY(xor_vis_2) | |||
90 | retl | 91 | retl |
91 | wr %g0, 0, %fprs | 92 | wr %g0, 0, %fprs |
92 | ENDPROC(xor_vis_2) | 93 | ENDPROC(xor_vis_2) |
94 | EXPORT_SYMBOL(xor_vis_2) | ||
93 | 95 | ||
94 | ENTRY(xor_vis_3) | 96 | ENTRY(xor_vis_3) |
95 | rd %fprs, %o5 | 97 | rd %fprs, %o5 |
@@ -156,6 +158,7 @@ ENTRY(xor_vis_3) | |||
156 | retl | 158 | retl |
157 | wr %g0, 0, %fprs | 159 | wr %g0, 0, %fprs |
158 | ENDPROC(xor_vis_3) | 160 | ENDPROC(xor_vis_3) |
161 | EXPORT_SYMBOL(xor_vis_3) | ||
159 | 162 | ||
160 | ENTRY(xor_vis_4) | 163 | ENTRY(xor_vis_4) |
161 | rd %fprs, %o5 | 164 | rd %fprs, %o5 |
@@ -241,6 +244,7 @@ ENTRY(xor_vis_4) | |||
241 | retl | 244 | retl |
242 | wr %g0, 0, %fprs | 245 | wr %g0, 0, %fprs |
243 | ENDPROC(xor_vis_4) | 246 | ENDPROC(xor_vis_4) |
247 | EXPORT_SYMBOL(xor_vis_4) | ||
244 | 248 | ||
245 | ENTRY(xor_vis_5) | 249 | ENTRY(xor_vis_5) |
246 | save %sp, -192, %sp | 250 | save %sp, -192, %sp |
@@ -347,6 +351,7 @@ ENTRY(xor_vis_5) | |||
347 | ret | 351 | ret |
348 | restore | 352 | restore |
349 | ENDPROC(xor_vis_5) | 353 | ENDPROC(xor_vis_5) |
354 | EXPORT_SYMBOL(xor_vis_5) | ||
350 | 355 | ||
351 | /* Niagara versions. */ | 356 | /* Niagara versions. */ |
352 | ENTRY(xor_niagara_2) /* %o0=bytes, %o1=dest, %o2=src */ | 357 | ENTRY(xor_niagara_2) /* %o0=bytes, %o1=dest, %o2=src */ |
@@ -393,6 +398,7 @@ ENTRY(xor_niagara_2) /* %o0=bytes, %o1=dest, %o2=src */ | |||
393 | ret | 398 | ret |
394 | restore | 399 | restore |
395 | ENDPROC(xor_niagara_2) | 400 | ENDPROC(xor_niagara_2) |
401 | EXPORT_SYMBOL(xor_niagara_2) | ||
396 | 402 | ||
397 | ENTRY(xor_niagara_3) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2 */ | 403 | ENTRY(xor_niagara_3) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2 */ |
398 | save %sp, -192, %sp | 404 | save %sp, -192, %sp |
@@ -454,6 +460,7 @@ ENTRY(xor_niagara_3) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2 */ | |||
454 | ret | 460 | ret |
455 | restore | 461 | restore |
456 | ENDPROC(xor_niagara_3) | 462 | ENDPROC(xor_niagara_3) |
463 | EXPORT_SYMBOL(xor_niagara_3) | ||
457 | 464 | ||
458 | ENTRY(xor_niagara_4) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3 */ | 465 | ENTRY(xor_niagara_4) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3 */ |
459 | save %sp, -192, %sp | 466 | save %sp, -192, %sp |
@@ -536,6 +543,7 @@ ENTRY(xor_niagara_4) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3 */ | |||
536 | ret | 543 | ret |
537 | restore | 544 | restore |
538 | ENDPROC(xor_niagara_4) | 545 | ENDPROC(xor_niagara_4) |
546 | EXPORT_SYMBOL(xor_niagara_4) | ||
539 | 547 | ||
540 | ENTRY(xor_niagara_5) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3, %o5=src4 */ | 548 | ENTRY(xor_niagara_5) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3, %o5=src4 */ |
541 | save %sp, -192, %sp | 549 | save %sp, -192, %sp |
@@ -634,3 +642,4 @@ ENTRY(xor_niagara_5) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3, %o5=s | |||
634 | ret | 642 | ret |
635 | restore | 643 | restore |
636 | ENDPROC(xor_niagara_5) | 644 | ENDPROC(xor_niagara_5) |
645 | EXPORT_SYMBOL(xor_niagara_5) | ||