diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-11-23 05:00:03 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-11-23 05:00:03 -0500 |
commit | 8478132a8784605fe07ede555f7277d989368d73 (patch) | |
tree | 68839876b870f8fb04c0491c2e0153046a7adf3a | |
parent | 2a3811068fbc6bf09bb09d166b65394b091c1085 (diff) |
Revert "arm: move exports to definitions"
This reverts commit 4dd1837d7589f468ed109556513f476e7a7f9121.
Moving the exports for assembly code into the assembly files breaks
KSYM trimming, but also breaks modversions.
While fixing the KSYM trimming is trivial, fixing modversions brings
us to a technically worse position that we had prior to the above
change:
- We end up with the prototype definitions divorsed from everything
else, which means that adding or removing assembly level ksyms
become more fragile:
* if adding a new assembly ksyms export, a missed prototype in
asm-prototypes.h results in a successful build if no module in
the selected configuration makes use of the symbol.
* when removing a ksyms export, asm-prototypes.h will get forgotten,
with armksyms.c, you'll get a build error if you forget to touch
the file.
- We end up with the same amount of include files and prototypes,
they're just in a header file instead of a .c file with their
exports.
As for lines of code, we don't get much of a size reduction:
(original commit)
47 files changed, 131 insertions(+), 208 deletions(-)
(fix for ksyms trimming)
7 files changed, 18 insertions(+), 5 deletions(-)
(two fixes for modversions)
1 file changed, 34 insertions(+)
3 files changed, 7 insertions(+), 2 deletions(-)
which results in a net total of only 25 lines deleted.
As there does not seem to be much benefit from this change of approach,
revert the change.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
47 files changed, 208 insertions, 131 deletions
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild index 0745538b26d3..55e0e3ea9cb6 100644 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild | |||
@@ -8,7 +8,6 @@ generic-y += early_ioremap.h | |||
8 | generic-y += emergency-restart.h | 8 | generic-y += emergency-restart.h |
9 | generic-y += errno.h | 9 | generic-y += errno.h |
10 | generic-y += exec.h | 10 | generic-y += exec.h |
11 | generic-y += export.h | ||
12 | generic-y += ioctl.h | 11 | generic-y += ioctl.h |
13 | generic-y += ipcbuf.h | 12 | generic-y += ipcbuf.h |
14 | generic-y += irq_regs.h | 13 | generic-y += irq_regs.h |
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 68c2c097cffe..ad325a8c7e1e 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile | |||
@@ -33,7 +33,7 @@ endif | |||
33 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o | 33 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o |
34 | obj-$(CONFIG_ISA_DMA_API) += dma.o | 34 | obj-$(CONFIG_ISA_DMA_API) += dma.o |
35 | obj-$(CONFIG_FIQ) += fiq.o fiqasm.o | 35 | obj-$(CONFIG_FIQ) += fiq.o fiqasm.o |
36 | obj-$(CONFIG_MODULES) += module.o | 36 | obj-$(CONFIG_MODULES) += armksyms.o module.o |
37 | obj-$(CONFIG_ARM_MODULE_PLTS) += module-plts.o | 37 | obj-$(CONFIG_ARM_MODULE_PLTS) += module-plts.o |
38 | obj-$(CONFIG_ISA_DMA) += dma-isa.o | 38 | obj-$(CONFIG_ISA_DMA) += dma-isa.o |
39 | obj-$(CONFIG_PCI) += bios32.o isa.o | 39 | obj-$(CONFIG_PCI) += bios32.o isa.o |
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c new file mode 100644 index 000000000000..7e45f69a0ddc --- /dev/null +++ b/arch/arm/kernel/armksyms.c | |||
@@ -0,0 +1,183 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/kernel/armksyms.c | ||
3 | * | ||
4 | * Copyright (C) 2000 Russell King | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #include <linux/export.h> | ||
11 | #include <linux/sched.h> | ||
12 | #include <linux/string.h> | ||
13 | #include <linux/cryptohash.h> | ||
14 | #include <linux/delay.h> | ||
15 | #include <linux/in6.h> | ||
16 | #include <linux/syscalls.h> | ||
17 | #include <linux/uaccess.h> | ||
18 | #include <linux/io.h> | ||
19 | #include <linux/arm-smccc.h> | ||
20 | |||
21 | #include <asm/checksum.h> | ||
22 | #include <asm/ftrace.h> | ||
23 | |||
24 | /* | ||
25 | * libgcc functions - functions that are used internally by the | ||
26 | * compiler... (prototypes are not correct though, but that | ||
27 | * doesn't really matter since they're not versioned). | ||
28 | */ | ||
29 | extern void __ashldi3(void); | ||
30 | extern void __ashrdi3(void); | ||
31 | extern void __divsi3(void); | ||
32 | extern void __lshrdi3(void); | ||
33 | extern void __modsi3(void); | ||
34 | extern void __muldi3(void); | ||
35 | extern void __ucmpdi2(void); | ||
36 | extern void __udivsi3(void); | ||
37 | extern void __umodsi3(void); | ||
38 | extern void __do_div64(void); | ||
39 | extern void __bswapsi2(void); | ||
40 | extern void __bswapdi2(void); | ||
41 | |||
42 | extern void __aeabi_idiv(void); | ||
43 | extern void __aeabi_idivmod(void); | ||
44 | extern void __aeabi_lasr(void); | ||
45 | extern void __aeabi_llsl(void); | ||
46 | extern void __aeabi_llsr(void); | ||
47 | extern void __aeabi_lmul(void); | ||
48 | extern void __aeabi_uidiv(void); | ||
49 | extern void __aeabi_uidivmod(void); | ||
50 | extern void __aeabi_ulcmp(void); | ||
51 | |||
52 | extern void fpundefinstr(void); | ||
53 | |||
54 | void mmioset(void *, unsigned int, size_t); | ||
55 | void mmiocpy(void *, const void *, size_t); | ||
56 | |||
57 | /* platform dependent support */ | ||
58 | EXPORT_SYMBOL(arm_delay_ops); | ||
59 | |||
60 | /* networking */ | ||
61 | EXPORT_SYMBOL(csum_partial); | ||
62 | EXPORT_SYMBOL(csum_partial_copy_from_user); | ||
63 | EXPORT_SYMBOL(csum_partial_copy_nocheck); | ||
64 | EXPORT_SYMBOL(__csum_ipv6_magic); | ||
65 | |||
66 | /* io */ | ||
67 | #ifndef __raw_readsb | ||
68 | EXPORT_SYMBOL(__raw_readsb); | ||
69 | #endif | ||
70 | #ifndef __raw_readsw | ||
71 | EXPORT_SYMBOL(__raw_readsw); | ||
72 | #endif | ||
73 | #ifndef __raw_readsl | ||
74 | EXPORT_SYMBOL(__raw_readsl); | ||
75 | #endif | ||
76 | #ifndef __raw_writesb | ||
77 | EXPORT_SYMBOL(__raw_writesb); | ||
78 | #endif | ||
79 | #ifndef __raw_writesw | ||
80 | EXPORT_SYMBOL(__raw_writesw); | ||
81 | #endif | ||
82 | #ifndef __raw_writesl | ||
83 | EXPORT_SYMBOL(__raw_writesl); | ||
84 | #endif | ||
85 | |||
86 | /* string / mem functions */ | ||
87 | EXPORT_SYMBOL(strchr); | ||
88 | EXPORT_SYMBOL(strrchr); | ||
89 | EXPORT_SYMBOL(memset); | ||
90 | EXPORT_SYMBOL(memcpy); | ||
91 | EXPORT_SYMBOL(memmove); | ||
92 | EXPORT_SYMBOL(memchr); | ||
93 | EXPORT_SYMBOL(__memzero); | ||
94 | |||
95 | EXPORT_SYMBOL(mmioset); | ||
96 | EXPORT_SYMBOL(mmiocpy); | ||
97 | |||
98 | #ifdef CONFIG_MMU | ||
99 | EXPORT_SYMBOL(copy_page); | ||
100 | |||
101 | EXPORT_SYMBOL(arm_copy_from_user); | ||
102 | EXPORT_SYMBOL(arm_copy_to_user); | ||
103 | EXPORT_SYMBOL(arm_clear_user); | ||
104 | |||
105 | EXPORT_SYMBOL(__get_user_1); | ||
106 | EXPORT_SYMBOL(__get_user_2); | ||
107 | EXPORT_SYMBOL(__get_user_4); | ||
108 | EXPORT_SYMBOL(__get_user_8); | ||
109 | |||
110 | #ifdef __ARMEB__ | ||
111 | EXPORT_SYMBOL(__get_user_64t_1); | ||
112 | EXPORT_SYMBOL(__get_user_64t_2); | ||
113 | EXPORT_SYMBOL(__get_user_64t_4); | ||
114 | EXPORT_SYMBOL(__get_user_32t_8); | ||
115 | #endif | ||
116 | |||
117 | EXPORT_SYMBOL(__put_user_1); | ||
118 | EXPORT_SYMBOL(__put_user_2); | ||
119 | EXPORT_SYMBOL(__put_user_4); | ||
120 | EXPORT_SYMBOL(__put_user_8); | ||
121 | #endif | ||
122 | |||
123 | /* gcc lib functions */ | ||
124 | EXPORT_SYMBOL(__ashldi3); | ||
125 | EXPORT_SYMBOL(__ashrdi3); | ||
126 | EXPORT_SYMBOL(__divsi3); | ||
127 | EXPORT_SYMBOL(__lshrdi3); | ||
128 | EXPORT_SYMBOL(__modsi3); | ||
129 | EXPORT_SYMBOL(__muldi3); | ||
130 | EXPORT_SYMBOL(__ucmpdi2); | ||
131 | EXPORT_SYMBOL(__udivsi3); | ||
132 | EXPORT_SYMBOL(__umodsi3); | ||
133 | EXPORT_SYMBOL(__do_div64); | ||
134 | EXPORT_SYMBOL(__bswapsi2); | ||
135 | EXPORT_SYMBOL(__bswapdi2); | ||
136 | |||
137 | #ifdef CONFIG_AEABI | ||
138 | EXPORT_SYMBOL(__aeabi_idiv); | ||
139 | EXPORT_SYMBOL(__aeabi_idivmod); | ||
140 | EXPORT_SYMBOL(__aeabi_lasr); | ||
141 | EXPORT_SYMBOL(__aeabi_llsl); | ||
142 | EXPORT_SYMBOL(__aeabi_llsr); | ||
143 | EXPORT_SYMBOL(__aeabi_lmul); | ||
144 | EXPORT_SYMBOL(__aeabi_uidiv); | ||
145 | EXPORT_SYMBOL(__aeabi_uidivmod); | ||
146 | EXPORT_SYMBOL(__aeabi_ulcmp); | ||
147 | #endif | ||
148 | |||
149 | /* bitops */ | ||
150 | EXPORT_SYMBOL(_set_bit); | ||
151 | EXPORT_SYMBOL(_test_and_set_bit); | ||
152 | EXPORT_SYMBOL(_clear_bit); | ||
153 | EXPORT_SYMBOL(_test_and_clear_bit); | ||
154 | EXPORT_SYMBOL(_change_bit); | ||
155 | EXPORT_SYMBOL(_test_and_change_bit); | ||
156 | EXPORT_SYMBOL(_find_first_zero_bit_le); | ||
157 | EXPORT_SYMBOL(_find_next_zero_bit_le); | ||
158 | EXPORT_SYMBOL(_find_first_bit_le); | ||
159 | EXPORT_SYMBOL(_find_next_bit_le); | ||
160 | |||
161 | #ifdef __ARMEB__ | ||
162 | EXPORT_SYMBOL(_find_first_zero_bit_be); | ||
163 | EXPORT_SYMBOL(_find_next_zero_bit_be); | ||
164 | EXPORT_SYMBOL(_find_first_bit_be); | ||
165 | EXPORT_SYMBOL(_find_next_bit_be); | ||
166 | #endif | ||
167 | |||
168 | #ifdef CONFIG_FUNCTION_TRACER | ||
169 | #ifdef CONFIG_OLD_MCOUNT | ||
170 | EXPORT_SYMBOL(mcount); | ||
171 | #endif | ||
172 | EXPORT_SYMBOL(__gnu_mcount_nc); | ||
173 | #endif | ||
174 | |||
175 | #ifdef CONFIG_ARM_PATCH_PHYS_VIRT | ||
176 | EXPORT_SYMBOL(__pv_phys_pfn_offset); | ||
177 | EXPORT_SYMBOL(__pv_offset); | ||
178 | #endif | ||
179 | |||
180 | #ifdef CONFIG_HAVE_ARM_SMCCC | ||
181 | EXPORT_SYMBOL(arm_smccc_smc); | ||
182 | EXPORT_SYMBOL(arm_smccc_hvc); | ||
183 | #endif | ||
diff --git a/arch/arm/kernel/entry-ftrace.S b/arch/arm/kernel/entry-ftrace.S index b629d3f11c3d..c73c4030ca5d 100644 --- a/arch/arm/kernel/entry-ftrace.S +++ b/arch/arm/kernel/entry-ftrace.S | |||
@@ -7,7 +7,6 @@ | |||
7 | #include <asm/assembler.h> | 7 | #include <asm/assembler.h> |
8 | #include <asm/ftrace.h> | 8 | #include <asm/ftrace.h> |
9 | #include <asm/unwind.h> | 9 | #include <asm/unwind.h> |
10 | #include <asm/export.h> | ||
11 | 10 | ||
12 | #include "entry-header.S" | 11 | #include "entry-header.S" |
13 | 12 | ||
@@ -154,7 +153,6 @@ ENTRY(mcount) | |||
154 | __mcount _old | 153 | __mcount _old |
155 | #endif | 154 | #endif |
156 | ENDPROC(mcount) | 155 | ENDPROC(mcount) |
157 | EXPORT_SYMBOL(mcount) | ||
158 | 156 | ||
159 | #ifdef CONFIG_DYNAMIC_FTRACE | 157 | #ifdef CONFIG_DYNAMIC_FTRACE |
160 | ENTRY(ftrace_caller_old) | 158 | ENTRY(ftrace_caller_old) |
@@ -207,7 +205,6 @@ UNWIND(.fnstart) | |||
207 | #endif | 205 | #endif |
208 | UNWIND(.fnend) | 206 | UNWIND(.fnend) |
209 | ENDPROC(__gnu_mcount_nc) | 207 | ENDPROC(__gnu_mcount_nc) |
210 | EXPORT_SYMBOL(__gnu_mcount_nc) | ||
211 | 208 | ||
212 | #ifdef CONFIG_DYNAMIC_FTRACE | 209 | #ifdef CONFIG_DYNAMIC_FTRACE |
213 | ENTRY(ftrace_caller) | 210 | ENTRY(ftrace_caller) |
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index f41cee4c5746..04286fd9e09c 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <asm/memory.h> | 22 | #include <asm/memory.h> |
23 | #include <asm/thread_info.h> | 23 | #include <asm/thread_info.h> |
24 | #include <asm/pgtable.h> | 24 | #include <asm/pgtable.h> |
25 | #include <asm/export.h> | ||
26 | 25 | ||
27 | #if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_SEMIHOSTING) | 26 | #if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_SEMIHOSTING) |
28 | #include CONFIG_DEBUG_LL_INCLUDE | 27 | #include CONFIG_DEBUG_LL_INCLUDE |
@@ -728,8 +727,6 @@ __pv_phys_pfn_offset: | |||
728 | __pv_offset: | 727 | __pv_offset: |
729 | .quad 0 | 728 | .quad 0 |
730 | .size __pv_offset, . -__pv_offset | 729 | .size __pv_offset, . -__pv_offset |
731 | EXPORT_SYMBOL(__pv_phys_pfn_offset) | ||
732 | EXPORT_SYMBOL(__pv_offset) | ||
733 | #endif | 730 | #endif |
734 | 731 | ||
735 | #include "head-common.S" | 732 | #include "head-common.S" |
diff --git a/arch/arm/kernel/smccc-call.S b/arch/arm/kernel/smccc-call.S index 37669e7e13af..2e48b674aab1 100644 --- a/arch/arm/kernel/smccc-call.S +++ b/arch/arm/kernel/smccc-call.S | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <asm/opcodes-sec.h> | 16 | #include <asm/opcodes-sec.h> |
17 | #include <asm/opcodes-virt.h> | 17 | #include <asm/opcodes-virt.h> |
18 | #include <asm/unwind.h> | 18 | #include <asm/unwind.h> |
19 | #include <asm/export.h> | ||
20 | 19 | ||
21 | /* | 20 | /* |
22 | * Wrap c macros in asm macros to delay expansion until after the | 21 | * Wrap c macros in asm macros to delay expansion until after the |
@@ -52,7 +51,6 @@ UNWIND( .fnend) | |||
52 | ENTRY(arm_smccc_smc) | 51 | ENTRY(arm_smccc_smc) |
53 | SMCCC SMCCC_SMC | 52 | SMCCC SMCCC_SMC |
54 | ENDPROC(arm_smccc_smc) | 53 | ENDPROC(arm_smccc_smc) |
55 | EXPORT_SYMBOL(arm_smccc_smc) | ||
56 | 54 | ||
57 | /* | 55 | /* |
58 | * void smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2, | 56 | * void smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2, |
@@ -62,4 +60,3 @@ EXPORT_SYMBOL(arm_smccc_smc) | |||
62 | ENTRY(arm_smccc_hvc) | 60 | ENTRY(arm_smccc_hvc) |
63 | SMCCC SMCCC_HVC | 61 | SMCCC SMCCC_HVC |
64 | ENDPROC(arm_smccc_hvc) | 62 | ENDPROC(arm_smccc_hvc) |
65 | EXPORT_SYMBOL(arm_smccc_hvc) | ||
diff --git a/arch/arm/lib/ashldi3.S b/arch/arm/lib/ashldi3.S index a7e7de89bd75..b05e95840651 100644 --- a/arch/arm/lib/ashldi3.S +++ b/arch/arm/lib/ashldi3.S | |||
@@ -28,7 +28,6 @@ Boston, MA 02110-1301, USA. */ | |||
28 | 28 | ||
29 | #include <linux/linkage.h> | 29 | #include <linux/linkage.h> |
30 | #include <asm/assembler.h> | 30 | #include <asm/assembler.h> |
31 | #include <asm/export.h> | ||
32 | 31 | ||
33 | #ifdef __ARMEB__ | 32 | #ifdef __ARMEB__ |
34 | #define al r1 | 33 | #define al r1 |
@@ -53,5 +52,3 @@ ENTRY(__aeabi_llsl) | |||
53 | 52 | ||
54 | ENDPROC(__ashldi3) | 53 | ENDPROC(__ashldi3) |
55 | ENDPROC(__aeabi_llsl) | 54 | ENDPROC(__aeabi_llsl) |
56 | EXPORT_SYMBOL(__ashldi3) | ||
57 | EXPORT_SYMBOL(__aeabi_llsl) | ||
diff --git a/arch/arm/lib/ashrdi3.S b/arch/arm/lib/ashrdi3.S index 490336e42518..275d7d2341a4 100644 --- a/arch/arm/lib/ashrdi3.S +++ b/arch/arm/lib/ashrdi3.S | |||
@@ -28,7 +28,6 @@ Boston, MA 02110-1301, USA. */ | |||
28 | 28 | ||
29 | #include <linux/linkage.h> | 29 | #include <linux/linkage.h> |
30 | #include <asm/assembler.h> | 30 | #include <asm/assembler.h> |
31 | #include <asm/export.h> | ||
32 | 31 | ||
33 | #ifdef __ARMEB__ | 32 | #ifdef __ARMEB__ |
34 | #define al r1 | 33 | #define al r1 |
@@ -53,5 +52,3 @@ ENTRY(__aeabi_lasr) | |||
53 | 52 | ||
54 | ENDPROC(__ashrdi3) | 53 | ENDPROC(__ashrdi3) |
55 | ENDPROC(__aeabi_lasr) | 54 | ENDPROC(__aeabi_lasr) |
56 | EXPORT_SYMBOL(__ashrdi3) | ||
57 | EXPORT_SYMBOL(__aeabi_lasr) | ||
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h index df06638b327c..7d807cfd8ef5 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h | |||
@@ -1,6 +1,5 @@ | |||
1 | #include <asm/assembler.h> | 1 | #include <asm/assembler.h> |
2 | #include <asm/unwind.h> | 2 | #include <asm/unwind.h> |
3 | #include <asm/export.h> | ||
4 | 3 | ||
5 | #if __LINUX_ARM_ARCH__ >= 6 | 4 | #if __LINUX_ARM_ARCH__ >= 6 |
6 | .macro bitop, name, instr | 5 | .macro bitop, name, instr |
@@ -26,7 +25,6 @@ UNWIND( .fnstart ) | |||
26 | bx lr | 25 | bx lr |
27 | UNWIND( .fnend ) | 26 | UNWIND( .fnend ) |
28 | ENDPROC(\name ) | 27 | ENDPROC(\name ) |
29 | EXPORT_SYMBOL(\name ) | ||
30 | .endm | 28 | .endm |
31 | 29 | ||
32 | .macro testop, name, instr, store | 30 | .macro testop, name, instr, store |
@@ -57,7 +55,6 @@ UNWIND( .fnstart ) | |||
57 | 2: bx lr | 55 | 2: bx lr |
58 | UNWIND( .fnend ) | 56 | UNWIND( .fnend ) |
59 | ENDPROC(\name ) | 57 | ENDPROC(\name ) |
60 | EXPORT_SYMBOL(\name ) | ||
61 | .endm | 58 | .endm |
62 | #else | 59 | #else |
63 | .macro bitop, name, instr | 60 | .macro bitop, name, instr |
@@ -77,7 +74,6 @@ UNWIND( .fnstart ) | |||
77 | ret lr | 74 | ret lr |
78 | UNWIND( .fnend ) | 75 | UNWIND( .fnend ) |
79 | ENDPROC(\name ) | 76 | ENDPROC(\name ) |
80 | EXPORT_SYMBOL(\name ) | ||
81 | .endm | 77 | .endm |
82 | 78 | ||
83 | /** | 79 | /** |
@@ -106,6 +102,5 @@ UNWIND( .fnstart ) | |||
106 | ret lr | 102 | ret lr |
107 | UNWIND( .fnend ) | 103 | UNWIND( .fnend ) |
108 | ENDPROC(\name ) | 104 | ENDPROC(\name ) |
109 | EXPORT_SYMBOL(\name ) | ||
110 | .endm | 105 | .endm |
111 | #endif | 106 | #endif |
diff --git a/arch/arm/lib/bswapsdi2.S b/arch/arm/lib/bswapsdi2.S index f05f78247304..07cda737bb11 100644 --- a/arch/arm/lib/bswapsdi2.S +++ b/arch/arm/lib/bswapsdi2.S | |||
@@ -1,6 +1,5 @@ | |||
1 | #include <linux/linkage.h> | 1 | #include <linux/linkage.h> |
2 | #include <asm/assembler.h> | 2 | #include <asm/assembler.h> |
3 | #include <asm/export.h> | ||
4 | 3 | ||
5 | #if __LINUX_ARM_ARCH__ >= 6 | 4 | #if __LINUX_ARM_ARCH__ >= 6 |
6 | ENTRY(__bswapsi2) | 5 | ENTRY(__bswapsi2) |
@@ -36,5 +35,3 @@ ENTRY(__bswapdi2) | |||
36 | ret lr | 35 | ret lr |
37 | ENDPROC(__bswapdi2) | 36 | ENDPROC(__bswapdi2) |
38 | #endif | 37 | #endif |
39 | EXPORT_SYMBOL(__bswapsi2) | ||
40 | EXPORT_SYMBOL(__bswapdi2) | ||
diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S index b566154f5cf4..e936352ccb00 100644 --- a/arch/arm/lib/clear_user.S +++ b/arch/arm/lib/clear_user.S | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
12 | #include <asm/unwind.h> | 12 | #include <asm/unwind.h> |
13 | #include <asm/export.h> | ||
14 | 13 | ||
15 | .text | 14 | .text |
16 | 15 | ||
@@ -51,9 +50,6 @@ USER( strnebt r2, [r0]) | |||
51 | UNWIND(.fnend) | 50 | UNWIND(.fnend) |
52 | ENDPROC(arm_clear_user) | 51 | ENDPROC(arm_clear_user) |
53 | ENDPROC(__clear_user_std) | 52 | ENDPROC(__clear_user_std) |
54 | #ifndef CONFIG_UACCESS_WITH_MEMCPY | ||
55 | EXPORT_SYMBOL(arm_clear_user) | ||
56 | #endif | ||
57 | 53 | ||
58 | .pushsection .text.fixup,"ax" | 54 | .pushsection .text.fixup,"ax" |
59 | .align 0 | 55 | .align 0 |
diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S index 63e4c1ed0225..7a4b06049001 100644 --- a/arch/arm/lib/copy_from_user.S +++ b/arch/arm/lib/copy_from_user.S | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
14 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
15 | #include <asm/unwind.h> | 15 | #include <asm/unwind.h> |
16 | #include <asm/export.h> | ||
17 | 16 | ||
18 | /* | 17 | /* |
19 | * Prototype: | 18 | * Prototype: |
@@ -95,7 +94,6 @@ ENTRY(arm_copy_from_user) | |||
95 | #include "copy_template.S" | 94 | #include "copy_template.S" |
96 | 95 | ||
97 | ENDPROC(arm_copy_from_user) | 96 | ENDPROC(arm_copy_from_user) |
98 | EXPORT_SYMBOL(arm_copy_from_user) | ||
99 | 97 | ||
100 | .pushsection .fixup,"ax" | 98 | .pushsection .fixup,"ax" |
101 | .align 0 | 99 | .align 0 |
diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S index d97851d4af7a..6ee2f6706f86 100644 --- a/arch/arm/lib/copy_page.S +++ b/arch/arm/lib/copy_page.S | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
14 | #include <asm/asm-offsets.h> | 14 | #include <asm/asm-offsets.h> |
15 | #include <asm/cache.h> | 15 | #include <asm/cache.h> |
16 | #include <asm/export.h> | ||
17 | 16 | ||
18 | #define COPY_COUNT (PAGE_SZ / (2 * L1_CACHE_BYTES) PLD( -1 )) | 17 | #define COPY_COUNT (PAGE_SZ / (2 * L1_CACHE_BYTES) PLD( -1 )) |
19 | 18 | ||
@@ -46,4 +45,3 @@ ENTRY(copy_page) | |||
46 | PLD( beq 2b ) | 45 | PLD( beq 2b ) |
47 | ldmfd sp!, {r4, pc} @ 3 | 46 | ldmfd sp!, {r4, pc} @ 3 |
48 | ENDPROC(copy_page) | 47 | ENDPROC(copy_page) |
49 | EXPORT_SYMBOL(copy_page) | ||
diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S index 592c179112d1..caf5019d8161 100644 --- a/arch/arm/lib/copy_to_user.S +++ b/arch/arm/lib/copy_to_user.S | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
14 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
15 | #include <asm/unwind.h> | 15 | #include <asm/unwind.h> |
16 | #include <asm/export.h> | ||
17 | 16 | ||
18 | /* | 17 | /* |
19 | * Prototype: | 18 | * Prototype: |
@@ -100,9 +99,6 @@ WEAK(arm_copy_to_user) | |||
100 | 99 | ||
101 | ENDPROC(arm_copy_to_user) | 100 | ENDPROC(arm_copy_to_user) |
102 | ENDPROC(__copy_to_user_std) | 101 | ENDPROC(__copy_to_user_std) |
103 | #ifndef CONFIG_UACCESS_WITH_MEMCPY | ||
104 | EXPORT_SYMBOL(arm_copy_to_user) | ||
105 | #endif | ||
106 | 102 | ||
107 | .pushsection .text.fixup,"ax" | 103 | .pushsection .text.fixup,"ax" |
108 | .align 0 | 104 | .align 0 |
diff --git a/arch/arm/lib/csumipv6.S b/arch/arm/lib/csumipv6.S index 68603b5ee537..3ac6ef01bc43 100644 --- a/arch/arm/lib/csumipv6.S +++ b/arch/arm/lib/csumipv6.S | |||
@@ -9,7 +9,6 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
12 | #include <asm/export.h> | ||
13 | 12 | ||
14 | .text | 13 | .text |
15 | 14 | ||
@@ -31,4 +30,4 @@ ENTRY(__csum_ipv6_magic) | |||
31 | adcs r0, r0, #0 | 30 | adcs r0, r0, #0 |
32 | ldmfd sp!, {pc} | 31 | ldmfd sp!, {pc} |
33 | ENDPROC(__csum_ipv6_magic) | 32 | ENDPROC(__csum_ipv6_magic) |
34 | EXPORT_SYMBOL(__csum_ipv6_magic) | 33 | |
diff --git a/arch/arm/lib/csumpartial.S b/arch/arm/lib/csumpartial.S index 830b20e81c37..984e0f29d548 100644 --- a/arch/arm/lib/csumpartial.S +++ b/arch/arm/lib/csumpartial.S | |||
@@ -9,7 +9,6 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
12 | #include <asm/export.h> | ||
13 | 12 | ||
14 | .text | 13 | .text |
15 | 14 | ||
@@ -141,4 +140,3 @@ ENTRY(csum_partial) | |||
141 | bne 4b | 140 | bne 4b |
142 | b .Lless4 | 141 | b .Lless4 |
143 | ENDPROC(csum_partial) | 142 | ENDPROC(csum_partial) |
144 | EXPORT_SYMBOL(csum_partial) | ||
diff --git a/arch/arm/lib/csumpartialcopy.S b/arch/arm/lib/csumpartialcopy.S index 9c3383fed129..d03fc71fc88c 100644 --- a/arch/arm/lib/csumpartialcopy.S +++ b/arch/arm/lib/csumpartialcopy.S | |||
@@ -49,6 +49,5 @@ | |||
49 | 49 | ||
50 | #define FN_ENTRY ENTRY(csum_partial_copy_nocheck) | 50 | #define FN_ENTRY ENTRY(csum_partial_copy_nocheck) |
51 | #define FN_EXIT ENDPROC(csum_partial_copy_nocheck) | 51 | #define FN_EXIT ENDPROC(csum_partial_copy_nocheck) |
52 | #define FN_EXPORT EXPORT_SYMBOL(csum_partial_copy_nocheck) | ||
53 | 52 | ||
54 | #include "csumpartialcopygeneric.S" | 53 | #include "csumpartialcopygeneric.S" |
diff --git a/arch/arm/lib/csumpartialcopygeneric.S b/arch/arm/lib/csumpartialcopygeneric.S index 8b94d20e51d1..10b45909610c 100644 --- a/arch/arm/lib/csumpartialcopygeneric.S +++ b/arch/arm/lib/csumpartialcopygeneric.S | |||
@@ -8,7 +8,6 @@ | |||
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | #include <asm/assembler.h> | 10 | #include <asm/assembler.h> |
11 | #include <asm/export.h> | ||
12 | 11 | ||
13 | /* | 12 | /* |
14 | * unsigned int | 13 | * unsigned int |
@@ -332,4 +331,3 @@ FN_ENTRY | |||
332 | mov r5, r4, get_byte_1 | 331 | mov r5, r4, get_byte_1 |
333 | b .Lexit | 332 | b .Lexit |
334 | FN_EXIT | 333 | FN_EXIT |
335 | FN_EXPORT | ||
diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S index 5d495edf3d83..1712f132b80d 100644 --- a/arch/arm/lib/csumpartialcopyuser.S +++ b/arch/arm/lib/csumpartialcopyuser.S | |||
@@ -73,7 +73,6 @@ | |||
73 | 73 | ||
74 | #define FN_ENTRY ENTRY(csum_partial_copy_from_user) | 74 | #define FN_ENTRY ENTRY(csum_partial_copy_from_user) |
75 | #define FN_EXIT ENDPROC(csum_partial_copy_from_user) | 75 | #define FN_EXIT ENDPROC(csum_partial_copy_from_user) |
76 | #define FN_EXPORT EXPORT_SYMBOL(csum_partial_copy_from_user) | ||
77 | 76 | ||
78 | #include "csumpartialcopygeneric.S" | 77 | #include "csumpartialcopygeneric.S" |
79 | 78 | ||
diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c index 69aad80a3af4..2cef11884857 100644 --- a/arch/arm/lib/delay.c +++ b/arch/arm/lib/delay.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | #include <linux/export.h> | ||
28 | #include <linux/timex.h> | 27 | #include <linux/timex.h> |
29 | 28 | ||
30 | /* | 29 | /* |
@@ -35,7 +34,6 @@ struct arm_delay_ops arm_delay_ops __ro_after_init = { | |||
35 | .const_udelay = __loop_const_udelay, | 34 | .const_udelay = __loop_const_udelay, |
36 | .udelay = __loop_udelay, | 35 | .udelay = __loop_udelay, |
37 | }; | 36 | }; |
38 | EXPORT_SYMBOL(arm_delay_ops); | ||
39 | 37 | ||
40 | static const struct delay_timer *delay_timer; | 38 | static const struct delay_timer *delay_timer; |
41 | static bool delay_calibrated; | 39 | static bool delay_calibrated; |
diff --git a/arch/arm/lib/div64.S b/arch/arm/lib/div64.S index 0c9e1c18fc9e..a9eafe4981eb 100644 --- a/arch/arm/lib/div64.S +++ b/arch/arm/lib/div64.S | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
16 | #include <asm/assembler.h> | 16 | #include <asm/assembler.h> |
17 | #include <asm/unwind.h> | 17 | #include <asm/unwind.h> |
18 | #include <asm/export.h> | ||
19 | 18 | ||
20 | #ifdef __ARMEB__ | 19 | #ifdef __ARMEB__ |
21 | #define xh r0 | 20 | #define xh r0 |
@@ -211,4 +210,3 @@ Ldiv0_64: | |||
211 | 210 | ||
212 | UNWIND(.fnend) | 211 | UNWIND(.fnend) |
213 | ENDPROC(__do_div64) | 212 | ENDPROC(__do_div64) |
214 | EXPORT_SYMBOL(__do_div64) | ||
diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S index 26302b8cd38f..7848780e8834 100644 --- a/arch/arm/lib/findbit.S +++ b/arch/arm/lib/findbit.S | |||
@@ -15,7 +15,6 @@ | |||
15 | */ | 15 | */ |
16 | #include <linux/linkage.h> | 16 | #include <linux/linkage.h> |
17 | #include <asm/assembler.h> | 17 | #include <asm/assembler.h> |
18 | #include <asm/export.h> | ||
19 | .text | 18 | .text |
20 | 19 | ||
21 | /* | 20 | /* |
@@ -38,7 +37,6 @@ ENTRY(_find_first_zero_bit_le) | |||
38 | 3: mov r0, r1 @ no free bits | 37 | 3: mov r0, r1 @ no free bits |
39 | ret lr | 38 | ret lr |
40 | ENDPROC(_find_first_zero_bit_le) | 39 | ENDPROC(_find_first_zero_bit_le) |
41 | EXPORT_SYMBOL(_find_first_zero_bit_le) | ||
42 | 40 | ||
43 | /* | 41 | /* |
44 | * Purpose : Find next 'zero' bit | 42 | * Purpose : Find next 'zero' bit |
@@ -59,7 +57,6 @@ ENTRY(_find_next_zero_bit_le) | |||
59 | add r2, r2, #1 @ align bit pointer | 57 | add r2, r2, #1 @ align bit pointer |
60 | b 2b @ loop for next bit | 58 | b 2b @ loop for next bit |
61 | ENDPROC(_find_next_zero_bit_le) | 59 | ENDPROC(_find_next_zero_bit_le) |
62 | EXPORT_SYMBOL(_find_next_zero_bit_le) | ||
63 | 60 | ||
64 | /* | 61 | /* |
65 | * Purpose : Find a 'one' bit | 62 | * Purpose : Find a 'one' bit |
@@ -81,7 +78,6 @@ ENTRY(_find_first_bit_le) | |||
81 | 3: mov r0, r1 @ no free bits | 78 | 3: mov r0, r1 @ no free bits |
82 | ret lr | 79 | ret lr |
83 | ENDPROC(_find_first_bit_le) | 80 | ENDPROC(_find_first_bit_le) |
84 | EXPORT_SYMBOL(_find_first_bit_le) | ||
85 | 81 | ||
86 | /* | 82 | /* |
87 | * Purpose : Find next 'one' bit | 83 | * Purpose : Find next 'one' bit |
@@ -101,7 +97,6 @@ ENTRY(_find_next_bit_le) | |||
101 | add r2, r2, #1 @ align bit pointer | 97 | add r2, r2, #1 @ align bit pointer |
102 | b 2b @ loop for next bit | 98 | b 2b @ loop for next bit |
103 | ENDPROC(_find_next_bit_le) | 99 | ENDPROC(_find_next_bit_le) |
104 | EXPORT_SYMBOL(_find_next_bit_le) | ||
105 | 100 | ||
106 | #ifdef __ARMEB__ | 101 | #ifdef __ARMEB__ |
107 | 102 | ||
@@ -121,7 +116,6 @@ ENTRY(_find_first_zero_bit_be) | |||
121 | 3: mov r0, r1 @ no free bits | 116 | 3: mov r0, r1 @ no free bits |
122 | ret lr | 117 | ret lr |
123 | ENDPROC(_find_first_zero_bit_be) | 118 | ENDPROC(_find_first_zero_bit_be) |
124 | EXPORT_SYMBOL(_find_first_zero_bit_be) | ||
125 | 119 | ||
126 | ENTRY(_find_next_zero_bit_be) | 120 | ENTRY(_find_next_zero_bit_be) |
127 | teq r1, #0 | 121 | teq r1, #0 |
@@ -139,7 +133,6 @@ ENTRY(_find_next_zero_bit_be) | |||
139 | add r2, r2, #1 @ align bit pointer | 133 | add r2, r2, #1 @ align bit pointer |
140 | b 2b @ loop for next bit | 134 | b 2b @ loop for next bit |
141 | ENDPROC(_find_next_zero_bit_be) | 135 | ENDPROC(_find_next_zero_bit_be) |
142 | EXPORT_SYMBOL(_find_next_zero_bit_be) | ||
143 | 136 | ||
144 | ENTRY(_find_first_bit_be) | 137 | ENTRY(_find_first_bit_be) |
145 | teq r1, #0 | 138 | teq r1, #0 |
@@ -157,7 +150,6 @@ ENTRY(_find_first_bit_be) | |||
157 | 3: mov r0, r1 @ no free bits | 150 | 3: mov r0, r1 @ no free bits |
158 | ret lr | 151 | ret lr |
159 | ENDPROC(_find_first_bit_be) | 152 | ENDPROC(_find_first_bit_be) |
160 | EXPORT_SYMBOL(_find_first_bit_be) | ||
161 | 153 | ||
162 | ENTRY(_find_next_bit_be) | 154 | ENTRY(_find_next_bit_be) |
163 | teq r1, #0 | 155 | teq r1, #0 |
@@ -174,7 +166,6 @@ ENTRY(_find_next_bit_be) | |||
174 | add r2, r2, #1 @ align bit pointer | 166 | add r2, r2, #1 @ align bit pointer |
175 | b 2b @ loop for next bit | 167 | b 2b @ loop for next bit |
176 | ENDPROC(_find_next_bit_be) | 168 | ENDPROC(_find_next_bit_be) |
177 | EXPORT_SYMBOL(_find_next_bit_be) | ||
178 | 169 | ||
179 | #endif | 170 | #endif |
180 | 171 | ||
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index 9d09a38e73af..8ecfd15c3a02 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/lib/getuser.S | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <asm/assembler.h> | 31 | #include <asm/assembler.h> |
32 | #include <asm/errno.h> | 32 | #include <asm/errno.h> |
33 | #include <asm/domain.h> | 33 | #include <asm/domain.h> |
34 | #include <asm/export.h> | ||
35 | 34 | ||
36 | ENTRY(__get_user_1) | 35 | ENTRY(__get_user_1) |
37 | check_uaccess r0, 1, r1, r2, __get_user_bad | 36 | check_uaccess r0, 1, r1, r2, __get_user_bad |
@@ -39,7 +38,6 @@ ENTRY(__get_user_1) | |||
39 | mov r0, #0 | 38 | mov r0, #0 |
40 | ret lr | 39 | ret lr |
41 | ENDPROC(__get_user_1) | 40 | ENDPROC(__get_user_1) |
42 | EXPORT_SYMBOL(__get_user_1) | ||
43 | 41 | ||
44 | ENTRY(__get_user_2) | 42 | ENTRY(__get_user_2) |
45 | check_uaccess r0, 2, r1, r2, __get_user_bad | 43 | check_uaccess r0, 2, r1, r2, __get_user_bad |
@@ -60,7 +58,6 @@ rb .req r0 | |||
60 | mov r0, #0 | 58 | mov r0, #0 |
61 | ret lr | 59 | ret lr |
62 | ENDPROC(__get_user_2) | 60 | ENDPROC(__get_user_2) |
63 | EXPORT_SYMBOL(__get_user_2) | ||
64 | 61 | ||
65 | ENTRY(__get_user_4) | 62 | ENTRY(__get_user_4) |
66 | check_uaccess r0, 4, r1, r2, __get_user_bad | 63 | check_uaccess r0, 4, r1, r2, __get_user_bad |
@@ -68,7 +65,6 @@ ENTRY(__get_user_4) | |||
68 | mov r0, #0 | 65 | mov r0, #0 |
69 | ret lr | 66 | ret lr |
70 | ENDPROC(__get_user_4) | 67 | ENDPROC(__get_user_4) |
71 | EXPORT_SYMBOL(__get_user_4) | ||
72 | 68 | ||
73 | ENTRY(__get_user_8) | 69 | ENTRY(__get_user_8) |
74 | check_uaccess r0, 8, r1, r2, __get_user_bad | 70 | check_uaccess r0, 8, r1, r2, __get_user_bad |
@@ -82,7 +78,6 @@ ENTRY(__get_user_8) | |||
82 | mov r0, #0 | 78 | mov r0, #0 |
83 | ret lr | 79 | ret lr |
84 | ENDPROC(__get_user_8) | 80 | ENDPROC(__get_user_8) |
85 | EXPORT_SYMBOL(__get_user_8) | ||
86 | 81 | ||
87 | #ifdef __ARMEB__ | 82 | #ifdef __ARMEB__ |
88 | ENTRY(__get_user_32t_8) | 83 | ENTRY(__get_user_32t_8) |
@@ -96,7 +91,6 @@ ENTRY(__get_user_32t_8) | |||
96 | mov r0, #0 | 91 | mov r0, #0 |
97 | ret lr | 92 | ret lr |
98 | ENDPROC(__get_user_32t_8) | 93 | ENDPROC(__get_user_32t_8) |
99 | EXPORT_SYMBOL(__get_user_32t_8) | ||
100 | 94 | ||
101 | ENTRY(__get_user_64t_1) | 95 | ENTRY(__get_user_64t_1) |
102 | check_uaccess r0, 1, r1, r2, __get_user_bad8 | 96 | check_uaccess r0, 1, r1, r2, __get_user_bad8 |
@@ -104,7 +98,6 @@ ENTRY(__get_user_64t_1) | |||
104 | mov r0, #0 | 98 | mov r0, #0 |
105 | ret lr | 99 | ret lr |
106 | ENDPROC(__get_user_64t_1) | 100 | ENDPROC(__get_user_64t_1) |
107 | EXPORT_SYMBOL(__get_user_64t_1) | ||
108 | 101 | ||
109 | ENTRY(__get_user_64t_2) | 102 | ENTRY(__get_user_64t_2) |
110 | check_uaccess r0, 2, r1, r2, __get_user_bad8 | 103 | check_uaccess r0, 2, r1, r2, __get_user_bad8 |
@@ -121,7 +114,6 @@ rb .req r0 | |||
121 | mov r0, #0 | 114 | mov r0, #0 |
122 | ret lr | 115 | ret lr |
123 | ENDPROC(__get_user_64t_2) | 116 | ENDPROC(__get_user_64t_2) |
124 | EXPORT_SYMBOL(__get_user_64t_2) | ||
125 | 117 | ||
126 | ENTRY(__get_user_64t_4) | 118 | ENTRY(__get_user_64t_4) |
127 | check_uaccess r0, 4, r1, r2, __get_user_bad8 | 119 | check_uaccess r0, 4, r1, r2, __get_user_bad8 |
@@ -129,7 +121,6 @@ ENTRY(__get_user_64t_4) | |||
129 | mov r0, #0 | 121 | mov r0, #0 |
130 | ret lr | 122 | ret lr |
131 | ENDPROC(__get_user_64t_4) | 123 | ENDPROC(__get_user_64t_4) |
132 | EXPORT_SYMBOL(__get_user_64t_4) | ||
133 | #endif | 124 | #endif |
134 | 125 | ||
135 | __get_user_bad8: | 126 | __get_user_bad8: |
diff --git a/arch/arm/lib/io-readsb.S b/arch/arm/lib/io-readsb.S index 3dff7a3a2aef..c31b2f3153f1 100644 --- a/arch/arm/lib/io-readsb.S +++ b/arch/arm/lib/io-readsb.S | |||
@@ -9,7 +9,6 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
12 | #include <asm/export.h> | ||
13 | 12 | ||
14 | .Linsb_align: rsb ip, ip, #4 | 13 | .Linsb_align: rsb ip, ip, #4 |
15 | cmp ip, r2 | 14 | cmp ip, r2 |
@@ -122,4 +121,3 @@ ENTRY(__raw_readsb) | |||
122 | 121 | ||
123 | ldmfd sp!, {r4 - r6, pc} | 122 | ldmfd sp!, {r4 - r6, pc} |
124 | ENDPROC(__raw_readsb) | 123 | ENDPROC(__raw_readsb) |
125 | EXPORT_SYMBOL(__raw_readsb) | ||
diff --git a/arch/arm/lib/io-readsl.S b/arch/arm/lib/io-readsl.S index bfd39682325b..2ed86fa5465f 100644 --- a/arch/arm/lib/io-readsl.S +++ b/arch/arm/lib/io-readsl.S | |||
@@ -9,7 +9,6 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
12 | #include <asm/export.h> | ||
13 | 12 | ||
14 | ENTRY(__raw_readsl) | 13 | ENTRY(__raw_readsl) |
15 | teq r2, #0 @ do we have to check for the zero len? | 14 | teq r2, #0 @ do we have to check for the zero len? |
@@ -78,4 +77,3 @@ ENTRY(__raw_readsl) | |||
78 | strb r3, [r1, #0] | 77 | strb r3, [r1, #0] |
79 | ret lr | 78 | ret lr |
80 | ENDPROC(__raw_readsl) | 79 | ENDPROC(__raw_readsl) |
81 | EXPORT_SYMBOL(__raw_readsl) | ||
diff --git a/arch/arm/lib/io-readsw-armv3.S b/arch/arm/lib/io-readsw-armv3.S index b3af3db6caac..413da9914529 100644 --- a/arch/arm/lib/io-readsw-armv3.S +++ b/arch/arm/lib/io-readsw-armv3.S | |||
@@ -9,7 +9,6 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
12 | #include <asm/export.h> | ||
13 | 12 | ||
14 | .Linsw_bad_alignment: | 13 | .Linsw_bad_alignment: |
15 | adr r0, .Linsw_bad_align_msg | 14 | adr r0, .Linsw_bad_align_msg |
@@ -104,4 +103,4 @@ ENTRY(__raw_readsw) | |||
104 | 103 | ||
105 | ldmfd sp!, {r4, r5, r6, pc} | 104 | ldmfd sp!, {r4, r5, r6, pc} |
106 | 105 | ||
107 | EXPORT_SYMBOL(__raw_readsw) | 106 | |
diff --git a/arch/arm/lib/io-readsw-armv4.S b/arch/arm/lib/io-readsw-armv4.S index 3c7a7a40b33e..d9a45e9692ae 100644 --- a/arch/arm/lib/io-readsw-armv4.S +++ b/arch/arm/lib/io-readsw-armv4.S | |||
@@ -9,7 +9,6 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
12 | #include <asm/export.h> | ||
13 | 12 | ||
14 | .macro pack, rd, hw1, hw2 | 13 | .macro pack, rd, hw1, hw2 |
15 | #ifndef __ARMEB__ | 14 | #ifndef __ARMEB__ |
@@ -130,4 +129,3 @@ ENTRY(__raw_readsw) | |||
130 | strneb ip, [r1] | 129 | strneb ip, [r1] |
131 | ldmfd sp!, {r4, pc} | 130 | ldmfd sp!, {r4, pc} |
132 | ENDPROC(__raw_readsw) | 131 | ENDPROC(__raw_readsw) |
133 | EXPORT_SYMBOL(__raw_readsw) | ||
diff --git a/arch/arm/lib/io-writesb.S b/arch/arm/lib/io-writesb.S index fa3633594415..a46bbc9b168b 100644 --- a/arch/arm/lib/io-writesb.S +++ b/arch/arm/lib/io-writesb.S | |||
@@ -9,7 +9,6 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
12 | #include <asm/export.h> | ||
13 | 12 | ||
14 | .macro outword, rd | 13 | .macro outword, rd |
15 | #ifndef __ARMEB__ | 14 | #ifndef __ARMEB__ |
@@ -93,4 +92,3 @@ ENTRY(__raw_writesb) | |||
93 | 92 | ||
94 | ldmfd sp!, {r4, r5, pc} | 93 | ldmfd sp!, {r4, r5, pc} |
95 | ENDPROC(__raw_writesb) | 94 | ENDPROC(__raw_writesb) |
96 | EXPORT_SYMBOL(__raw_writesb) | ||
diff --git a/arch/arm/lib/io-writesl.S b/arch/arm/lib/io-writesl.S index 98ed6aec0b47..4ea2435988c1 100644 --- a/arch/arm/lib/io-writesl.S +++ b/arch/arm/lib/io-writesl.S | |||
@@ -9,7 +9,6 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
12 | #include <asm/export.h> | ||
13 | 12 | ||
14 | ENTRY(__raw_writesl) | 13 | ENTRY(__raw_writesl) |
15 | teq r2, #0 @ do we have to check for the zero len? | 14 | teq r2, #0 @ do we have to check for the zero len? |
@@ -66,4 +65,3 @@ ENTRY(__raw_writesl) | |||
66 | bne 6b | 65 | bne 6b |
67 | ret lr | 66 | ret lr |
68 | ENDPROC(__raw_writesl) | 67 | ENDPROC(__raw_writesl) |
69 | EXPORT_SYMBOL(__raw_writesl) | ||
diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S index 577184c082bb..121789eb6802 100644 --- a/arch/arm/lib/io-writesw-armv3.S +++ b/arch/arm/lib/io-writesw-armv3.S | |||
@@ -9,7 +9,6 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
12 | #include <asm/export.h> | ||
13 | 12 | ||
14 | .Loutsw_bad_alignment: | 13 | .Loutsw_bad_alignment: |
15 | adr r0, .Loutsw_bad_align_msg | 14 | adr r0, .Loutsw_bad_align_msg |
@@ -125,4 +124,3 @@ ENTRY(__raw_writesw) | |||
125 | strne ip, [r0] | 124 | strne ip, [r0] |
126 | 125 | ||
127 | ldmfd sp!, {r4, r5, r6, pc} | 126 | ldmfd sp!, {r4, r5, r6, pc} |
128 | EXPORT_SYMBOL(__raw_writesw) | ||
diff --git a/arch/arm/lib/io-writesw-armv4.S b/arch/arm/lib/io-writesw-armv4.S index e335f489d1fc..269f90c51ad2 100644 --- a/arch/arm/lib/io-writesw-armv4.S +++ b/arch/arm/lib/io-writesw-armv4.S | |||
@@ -9,7 +9,6 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
12 | #include <asm/export.h> | ||
13 | 12 | ||
14 | .macro outword, rd | 13 | .macro outword, rd |
15 | #ifndef __ARMEB__ | 14 | #ifndef __ARMEB__ |
@@ -99,4 +98,3 @@ ENTRY(__raw_writesw) | |||
99 | strneh ip, [r0] | 98 | strneh ip, [r0] |
100 | ret lr | 99 | ret lr |
101 | ENDPROC(__raw_writesw) | 100 | ENDPROC(__raw_writesw) |
102 | EXPORT_SYMBOL(__raw_writesw) | ||
diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S index f541bc013bff..9397b2e532af 100644 --- a/arch/arm/lib/lib1funcs.S +++ b/arch/arm/lib/lib1funcs.S | |||
@@ -36,7 +36,6 @@ Boston, MA 02111-1307, USA. */ | |||
36 | #include <linux/linkage.h> | 36 | #include <linux/linkage.h> |
37 | #include <asm/assembler.h> | 37 | #include <asm/assembler.h> |
38 | #include <asm/unwind.h> | 38 | #include <asm/unwind.h> |
39 | #include <asm/export.h> | ||
40 | 39 | ||
41 | .macro ARM_DIV_BODY dividend, divisor, result, curbit | 40 | .macro ARM_DIV_BODY dividend, divisor, result, curbit |
42 | 41 | ||
@@ -239,8 +238,6 @@ UNWIND(.fnstart) | |||
239 | UNWIND(.fnend) | 238 | UNWIND(.fnend) |
240 | ENDPROC(__udivsi3) | 239 | ENDPROC(__udivsi3) |
241 | ENDPROC(__aeabi_uidiv) | 240 | ENDPROC(__aeabi_uidiv) |
242 | EXPORT_SYMBOL(__udivsi3) | ||
243 | EXPORT_SYMBOL(__aeabi_uidiv) | ||
244 | 241 | ||
245 | ENTRY(__umodsi3) | 242 | ENTRY(__umodsi3) |
246 | UNWIND(.fnstart) | 243 | UNWIND(.fnstart) |
@@ -259,7 +256,6 @@ UNWIND(.fnstart) | |||
259 | 256 | ||
260 | UNWIND(.fnend) | 257 | UNWIND(.fnend) |
261 | ENDPROC(__umodsi3) | 258 | ENDPROC(__umodsi3) |
262 | EXPORT_SYMBOL(__umodsi3) | ||
263 | 259 | ||
264 | #ifdef CONFIG_ARM_PATCH_IDIV | 260 | #ifdef CONFIG_ARM_PATCH_IDIV |
265 | .align 3 | 261 | .align 3 |
@@ -307,8 +303,6 @@ UNWIND(.fnstart) | |||
307 | UNWIND(.fnend) | 303 | UNWIND(.fnend) |
308 | ENDPROC(__divsi3) | 304 | ENDPROC(__divsi3) |
309 | ENDPROC(__aeabi_idiv) | 305 | ENDPROC(__aeabi_idiv) |
310 | EXPORT_SYMBOL(__divsi3) | ||
311 | EXPORT_SYMBOL(__aeabi_idiv) | ||
312 | 306 | ||
313 | ENTRY(__modsi3) | 307 | ENTRY(__modsi3) |
314 | UNWIND(.fnstart) | 308 | UNWIND(.fnstart) |
@@ -333,7 +327,6 @@ UNWIND(.fnstart) | |||
333 | 327 | ||
334 | UNWIND(.fnend) | 328 | UNWIND(.fnend) |
335 | ENDPROC(__modsi3) | 329 | ENDPROC(__modsi3) |
336 | EXPORT_SYMBOL(__modsi3) | ||
337 | 330 | ||
338 | #ifdef CONFIG_AEABI | 331 | #ifdef CONFIG_AEABI |
339 | 332 | ||
@@ -350,7 +343,6 @@ UNWIND(.save {r0, r1, ip, lr} ) | |||
350 | 343 | ||
351 | UNWIND(.fnend) | 344 | UNWIND(.fnend) |
352 | ENDPROC(__aeabi_uidivmod) | 345 | ENDPROC(__aeabi_uidivmod) |
353 | EXPORT_SYMBOL(__aeabi_uidivmod) | ||
354 | 346 | ||
355 | ENTRY(__aeabi_idivmod) | 347 | ENTRY(__aeabi_idivmod) |
356 | UNWIND(.fnstart) | 348 | UNWIND(.fnstart) |
@@ -364,7 +356,6 @@ UNWIND(.save {r0, r1, ip, lr} ) | |||
364 | 356 | ||
365 | UNWIND(.fnend) | 357 | UNWIND(.fnend) |
366 | ENDPROC(__aeabi_idivmod) | 358 | ENDPROC(__aeabi_idivmod) |
367 | EXPORT_SYMBOL(__aeabi_idivmod) | ||
368 | 359 | ||
369 | #endif | 360 | #endif |
370 | 361 | ||
diff --git a/arch/arm/lib/lshrdi3.S b/arch/arm/lib/lshrdi3.S index e40833981417..922dcd88b02b 100644 --- a/arch/arm/lib/lshrdi3.S +++ b/arch/arm/lib/lshrdi3.S | |||
@@ -28,7 +28,6 @@ Boston, MA 02110-1301, USA. */ | |||
28 | 28 | ||
29 | #include <linux/linkage.h> | 29 | #include <linux/linkage.h> |
30 | #include <asm/assembler.h> | 30 | #include <asm/assembler.h> |
31 | #include <asm/export.h> | ||
32 | 31 | ||
33 | #ifdef __ARMEB__ | 32 | #ifdef __ARMEB__ |
34 | #define al r1 | 33 | #define al r1 |
@@ -53,5 +52,3 @@ ENTRY(__aeabi_llsr) | |||
53 | 52 | ||
54 | ENDPROC(__lshrdi3) | 53 | ENDPROC(__lshrdi3) |
55 | ENDPROC(__aeabi_llsr) | 54 | ENDPROC(__aeabi_llsr) |
56 | EXPORT_SYMBOL(__lshrdi3) | ||
57 | EXPORT_SYMBOL(__aeabi_llsr) | ||
diff --git a/arch/arm/lib/memchr.S b/arch/arm/lib/memchr.S index 44182bf686a5..74a5bed6d999 100644 --- a/arch/arm/lib/memchr.S +++ b/arch/arm/lib/memchr.S | |||
@@ -11,7 +11,6 @@ | |||
11 | */ | 11 | */ |
12 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
13 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
14 | #include <asm/export.h> | ||
15 | 14 | ||
16 | .text | 15 | .text |
17 | .align 5 | 16 | .align 5 |
@@ -25,4 +24,3 @@ ENTRY(memchr) | |||
25 | 2: movne r0, #0 | 24 | 2: movne r0, #0 |
26 | ret lr | 25 | ret lr |
27 | ENDPROC(memchr) | 26 | ENDPROC(memchr) |
28 | EXPORT_SYMBOL(memchr) | ||
diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index 1be5b6ddf37c..64111bd4440b 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
14 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
15 | #include <asm/unwind.h> | 15 | #include <asm/unwind.h> |
16 | #include <asm/export.h> | ||
17 | 16 | ||
18 | #define LDR1W_SHIFT 0 | 17 | #define LDR1W_SHIFT 0 |
19 | #define STR1W_SHIFT 0 | 18 | #define STR1W_SHIFT 0 |
@@ -69,5 +68,3 @@ ENTRY(memcpy) | |||
69 | 68 | ||
70 | ENDPROC(memcpy) | 69 | ENDPROC(memcpy) |
71 | ENDPROC(mmiocpy) | 70 | ENDPROC(mmiocpy) |
72 | EXPORT_SYMBOL(memcpy) | ||
73 | EXPORT_SYMBOL(mmiocpy) | ||
diff --git a/arch/arm/lib/memmove.S b/arch/arm/lib/memmove.S index 71dcc5400d02..69a9d47fc5ab 100644 --- a/arch/arm/lib/memmove.S +++ b/arch/arm/lib/memmove.S | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
14 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
15 | #include <asm/unwind.h> | 15 | #include <asm/unwind.h> |
16 | #include <asm/export.h> | ||
17 | 16 | ||
18 | .text | 17 | .text |
19 | 18 | ||
@@ -226,4 +225,3 @@ ENTRY(memmove) | |||
226 | 18: backward_copy_shift push=24 pull=8 | 225 | 18: backward_copy_shift push=24 pull=8 |
227 | 226 | ||
228 | ENDPROC(memmove) | 227 | ENDPROC(memmove) |
229 | EXPORT_SYMBOL(memmove) | ||
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index 7b72044cba62..3c65e3bd790f 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
13 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
14 | #include <asm/unwind.h> | 14 | #include <asm/unwind.h> |
15 | #include <asm/export.h> | ||
16 | 15 | ||
17 | .text | 16 | .text |
18 | .align 5 | 17 | .align 5 |
@@ -136,5 +135,3 @@ UNWIND( .fnstart ) | |||
136 | UNWIND( .fnend ) | 135 | UNWIND( .fnend ) |
137 | ENDPROC(memset) | 136 | ENDPROC(memset) |
138 | ENDPROC(mmioset) | 137 | ENDPROC(mmioset) |
139 | EXPORT_SYMBOL(memset) | ||
140 | EXPORT_SYMBOL(mmioset) | ||
diff --git a/arch/arm/lib/memzero.S b/arch/arm/lib/memzero.S index 6dec26ed5bcc..0eded952e089 100644 --- a/arch/arm/lib/memzero.S +++ b/arch/arm/lib/memzero.S | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
12 | #include <asm/unwind.h> | 12 | #include <asm/unwind.h> |
13 | #include <asm/export.h> | ||
14 | 13 | ||
15 | .text | 14 | .text |
16 | .align 5 | 15 | .align 5 |
@@ -136,4 +135,3 @@ UNWIND( .fnstart ) | |||
136 | ret lr @ 1 | 135 | ret lr @ 1 |
137 | UNWIND( .fnend ) | 136 | UNWIND( .fnend ) |
138 | ENDPROC(__memzero) | 137 | ENDPROC(__memzero) |
139 | EXPORT_SYMBOL(__memzero) | ||
diff --git a/arch/arm/lib/muldi3.S b/arch/arm/lib/muldi3.S index b8f12388ccac..204305956925 100644 --- a/arch/arm/lib/muldi3.S +++ b/arch/arm/lib/muldi3.S | |||
@@ -12,7 +12,6 @@ | |||
12 | 12 | ||
13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
14 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
15 | #include <asm/export.h> | ||
16 | 15 | ||
17 | #ifdef __ARMEB__ | 16 | #ifdef __ARMEB__ |
18 | #define xh r0 | 17 | #define xh r0 |
@@ -47,5 +46,3 @@ ENTRY(__aeabi_lmul) | |||
47 | 46 | ||
48 | ENDPROC(__muldi3) | 47 | ENDPROC(__muldi3) |
49 | ENDPROC(__aeabi_lmul) | 48 | ENDPROC(__aeabi_lmul) |
50 | EXPORT_SYMBOL(__muldi3) | ||
51 | EXPORT_SYMBOL(__aeabi_lmul) | ||
diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S index 11de126e2ed6..38d660d3705f 100644 --- a/arch/arm/lib/putuser.S +++ b/arch/arm/lib/putuser.S | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <asm/assembler.h> | 31 | #include <asm/assembler.h> |
32 | #include <asm/errno.h> | 32 | #include <asm/errno.h> |
33 | #include <asm/domain.h> | 33 | #include <asm/domain.h> |
34 | #include <asm/export.h> | ||
35 | 34 | ||
36 | ENTRY(__put_user_1) | 35 | ENTRY(__put_user_1) |
37 | check_uaccess r0, 1, r1, ip, __put_user_bad | 36 | check_uaccess r0, 1, r1, ip, __put_user_bad |
@@ -39,7 +38,6 @@ ENTRY(__put_user_1) | |||
39 | mov r0, #0 | 38 | mov r0, #0 |
40 | ret lr | 39 | ret lr |
41 | ENDPROC(__put_user_1) | 40 | ENDPROC(__put_user_1) |
42 | EXPORT_SYMBOL(__put_user_1) | ||
43 | 41 | ||
44 | ENTRY(__put_user_2) | 42 | ENTRY(__put_user_2) |
45 | check_uaccess r0, 2, r1, ip, __put_user_bad | 43 | check_uaccess r0, 2, r1, ip, __put_user_bad |
@@ -64,7 +62,6 @@ ENTRY(__put_user_2) | |||
64 | mov r0, #0 | 62 | mov r0, #0 |
65 | ret lr | 63 | ret lr |
66 | ENDPROC(__put_user_2) | 64 | ENDPROC(__put_user_2) |
67 | EXPORT_SYMBOL(__put_user_2) | ||
68 | 65 | ||
69 | ENTRY(__put_user_4) | 66 | ENTRY(__put_user_4) |
70 | check_uaccess r0, 4, r1, ip, __put_user_bad | 67 | check_uaccess r0, 4, r1, ip, __put_user_bad |
@@ -72,7 +69,6 @@ ENTRY(__put_user_4) | |||
72 | mov r0, #0 | 69 | mov r0, #0 |
73 | ret lr | 70 | ret lr |
74 | ENDPROC(__put_user_4) | 71 | ENDPROC(__put_user_4) |
75 | EXPORT_SYMBOL(__put_user_4) | ||
76 | 72 | ||
77 | ENTRY(__put_user_8) | 73 | ENTRY(__put_user_8) |
78 | check_uaccess r0, 8, r1, ip, __put_user_bad | 74 | check_uaccess r0, 8, r1, ip, __put_user_bad |
@@ -86,7 +82,6 @@ ENTRY(__put_user_8) | |||
86 | mov r0, #0 | 82 | mov r0, #0 |
87 | ret lr | 83 | ret lr |
88 | ENDPROC(__put_user_8) | 84 | ENDPROC(__put_user_8) |
89 | EXPORT_SYMBOL(__put_user_8) | ||
90 | 85 | ||
91 | __put_user_bad: | 86 | __put_user_bad: |
92 | mov r0, #-EFAULT | 87 | mov r0, #-EFAULT |
diff --git a/arch/arm/lib/strchr.S b/arch/arm/lib/strchr.S index 7301f6e6046c..013d64c71e8d 100644 --- a/arch/arm/lib/strchr.S +++ b/arch/arm/lib/strchr.S | |||
@@ -11,7 +11,6 @@ | |||
11 | */ | 11 | */ |
12 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
13 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
14 | #include <asm/export.h> | ||
15 | 14 | ||
16 | .text | 15 | .text |
17 | .align 5 | 16 | .align 5 |
@@ -26,4 +25,3 @@ ENTRY(strchr) | |||
26 | subeq r0, r0, #1 | 25 | subeq r0, r0, #1 |
27 | ret lr | 26 | ret lr |
28 | ENDPROC(strchr) | 27 | ENDPROC(strchr) |
29 | EXPORT_SYMBOL(strchr) | ||
diff --git a/arch/arm/lib/strrchr.S b/arch/arm/lib/strrchr.S index aaf9fd98b754..3cec1c7482c4 100644 --- a/arch/arm/lib/strrchr.S +++ b/arch/arm/lib/strrchr.S | |||
@@ -11,7 +11,6 @@ | |||
11 | */ | 11 | */ |
12 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
13 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
14 | #include <asm/export.h> | ||
15 | 14 | ||
16 | .text | 15 | .text |
17 | .align 5 | 16 | .align 5 |
@@ -25,4 +24,3 @@ ENTRY(strrchr) | |||
25 | mov r0, r3 | 24 | mov r0, r3 |
26 | ret lr | 25 | ret lr |
27 | ENDPROC(strrchr) | 26 | ENDPROC(strrchr) |
28 | EXPORT_SYMBOL(strrchr) | ||
diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c index 1626e3a551a1..6bd1089b07e0 100644 --- a/arch/arm/lib/uaccess_with_memcpy.c +++ b/arch/arm/lib/uaccess_with_memcpy.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/gfp.h> | 19 | #include <linux/gfp.h> |
20 | #include <linux/highmem.h> | 20 | #include <linux/highmem.h> |
21 | #include <linux/hugetlb.h> | 21 | #include <linux/hugetlb.h> |
22 | #include <linux/export.h> | ||
23 | #include <asm/current.h> | 22 | #include <asm/current.h> |
24 | #include <asm/page.h> | 23 | #include <asm/page.h> |
25 | 24 | ||
@@ -157,7 +156,6 @@ arm_copy_to_user(void __user *to, const void *from, unsigned long n) | |||
157 | } | 156 | } |
158 | return n; | 157 | return n; |
159 | } | 158 | } |
160 | EXPORT_SYMBOL(arm_copy_to_user); | ||
161 | 159 | ||
162 | static unsigned long noinline | 160 | static unsigned long noinline |
163 | __clear_user_memset(void __user *addr, unsigned long n) | 161 | __clear_user_memset(void __user *addr, unsigned long n) |
@@ -215,7 +213,6 @@ unsigned long arm_clear_user(void __user *addr, unsigned long n) | |||
215 | } | 213 | } |
216 | return n; | 214 | return n; |
217 | } | 215 | } |
218 | EXPORT_SYMBOL(arm_clear_user); | ||
219 | 216 | ||
220 | #if 0 | 217 | #if 0 |
221 | 218 | ||
diff --git a/arch/arm/lib/ucmpdi2.S b/arch/arm/lib/ucmpdi2.S index 127a91af46f3..ad4a6309141a 100644 --- a/arch/arm/lib/ucmpdi2.S +++ b/arch/arm/lib/ucmpdi2.S | |||
@@ -12,7 +12,6 @@ | |||
12 | 12 | ||
13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
14 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
15 | #include <asm/export.h> | ||
16 | 15 | ||
17 | #ifdef __ARMEB__ | 16 | #ifdef __ARMEB__ |
18 | #define xh r0 | 17 | #define xh r0 |
@@ -36,7 +35,6 @@ ENTRY(__ucmpdi2) | |||
36 | ret lr | 35 | ret lr |
37 | 36 | ||
38 | ENDPROC(__ucmpdi2) | 37 | ENDPROC(__ucmpdi2) |
39 | EXPORT_SYMBOL(__ucmpdi2) | ||
40 | 38 | ||
41 | #ifdef CONFIG_AEABI | 39 | #ifdef CONFIG_AEABI |
42 | 40 | ||
@@ -50,7 +48,6 @@ ENTRY(__aeabi_ulcmp) | |||
50 | ret lr | 48 | ret lr |
51 | 49 | ||
52 | ENDPROC(__aeabi_ulcmp) | 50 | ENDPROC(__aeabi_ulcmp) |
53 | EXPORT_SYMBOL(__aeabi_ulcmp) | ||
54 | 51 | ||
55 | #endif | 52 | #endif |
56 | 53 | ||
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 737450fe790c..cab128913e72 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile | |||
@@ -32,6 +32,7 @@ endif | |||
32 | 32 | ||
33 | ifdef CONFIG_SND_IMX_SOC | 33 | ifdef CONFIG_SND_IMX_SOC |
34 | obj-y += ssi-fiq.o | 34 | obj-y += ssi-fiq.o |
35 | obj-y += ssi-fiq-ksym.o | ||
35 | endif | 36 | endif |
36 | 37 | ||
37 | # i.MX21 based machines | 38 | # i.MX21 based machines |
diff --git a/arch/arm/mach-imx/ssi-fiq-ksym.c b/arch/arm/mach-imx/ssi-fiq-ksym.c new file mode 100644 index 000000000000..792090f9a032 --- /dev/null +++ b/arch/arm/mach-imx/ssi-fiq-ksym.c | |||
@@ -0,0 +1,20 @@ | |||
1 | /* | ||
2 | * Exported ksyms for the SSI FIQ handler | ||
3 | * | ||
4 | * Copyright (C) 2009, Sascha Hauer <s.hauer@pengutronix.de> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #include <linux/module.h> | ||
12 | |||
13 | #include <linux/platform_data/asoc-imx-ssi.h> | ||
14 | |||
15 | EXPORT_SYMBOL(imx_ssi_fiq_tx_buffer); | ||
16 | EXPORT_SYMBOL(imx_ssi_fiq_rx_buffer); | ||
17 | EXPORT_SYMBOL(imx_ssi_fiq_start); | ||
18 | EXPORT_SYMBOL(imx_ssi_fiq_end); | ||
19 | EXPORT_SYMBOL(imx_ssi_fiq_base); | ||
20 | |||
diff --git a/arch/arm/mach-imx/ssi-fiq.S b/arch/arm/mach-imx/ssi-fiq.S index fd7917f1c204..a8b93c5f29b5 100644 --- a/arch/arm/mach-imx/ssi-fiq.S +++ b/arch/arm/mach-imx/ssi-fiq.S | |||
@@ -8,7 +8,6 @@ | |||
8 | 8 | ||
9 | #include <linux/linkage.h> | 9 | #include <linux/linkage.h> |
10 | #include <asm/assembler.h> | 10 | #include <asm/assembler.h> |
11 | #include <asm/export.h> | ||
12 | 11 | ||
13 | /* | 12 | /* |
14 | * r8 = bit 0-15: tx offset, bit 16-31: tx buffer size | 13 | * r8 = bit 0-15: tx offset, bit 16-31: tx buffer size |
@@ -145,8 +144,4 @@ imx_ssi_fiq_tx_buffer: | |||
145 | .word 0x0 | 144 | .word 0x0 |
146 | .L_imx_ssi_fiq_end: | 145 | .L_imx_ssi_fiq_end: |
147 | imx_ssi_fiq_end: | 146 | imx_ssi_fiq_end: |
148 | EXPORT_SYMBOL(imx_ssi_fiq_tx_buffer) | 147 | |
149 | EXPORT_SYMBOL(imx_ssi_fiq_rx_buffer) | ||
150 | EXPORT_SYMBOL(imx_ssi_fiq_start) | ||
151 | EXPORT_SYMBOL(imx_ssi_fiq_end) | ||
152 | EXPORT_SYMBOL(imx_ssi_fiq_base) | ||