Skip to content

Commit 4dd1837

Browse files
author
Al Viro
committed
arm: move exports to definitions
Signed-off-by: Al Viro <[email protected]>
1 parent 711f5df commit 4dd1837

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+131
-208
lines changed

‎arch/arm/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ generic-y += early_ioremap.h
88
generic-y += emergency-restart.h
99
generic-y += errno.h
1010
generic-y += exec.h
11+
generic-y += export.h
1112
generic-y += ioctl.h
1213
generic-y += ipcbuf.h
1314
generic-y += irq_regs.h

‎arch/arm/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ endif
3333
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
3434
obj-$(CONFIG_ISA_DMA_API) += dma.o
3535
obj-$(CONFIG_FIQ) += fiq.o fiqasm.o
36-
obj-$(CONFIG_MODULES) += armksyms.o module.o
36+
obj-$(CONFIG_MODULES) += module.o
3737
obj-$(CONFIG_ARM_MODULE_PLTS) += module-plts.o
3838
obj-$(CONFIG_ISA_DMA) += dma-isa.o
3939
obj-$(CONFIG_PCI) += bios32.o isa.o

‎arch/arm/kernel/armksyms.c

Lines changed: 0 additions & 183 deletions
This file was deleted.

‎arch/arm/kernel/entry-ftrace.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <asm/assembler.h>
88
#include <asm/ftrace.h>
99
#include <asm/unwind.h>
10+
#include <asm/export.h>
1011

1112
#include "entry-header.S"
1213

@@ -153,6 +154,7 @@ ENTRY(mcount)
153154
__mcount _old
154155
#endif
155156
ENDPROC(mcount)
157+
EXPORT_SYMBOL(mcount)
156158

157159
#ifdef CONFIG_DYNAMIC_FTRACE
158160
ENTRY(ftrace_caller_old)
@@ -205,6 +207,7 @@ UNWIND(.fnstart)
205207
#endif
206208
UNWIND(.fnend)
207209
ENDPROC(__gnu_mcount_nc)
210+
EXPORT_SYMBOL(__gnu_mcount_nc)
208211

209212
#ifdef CONFIG_DYNAMIC_FTRACE
210213
ENTRY(ftrace_caller)

‎arch/arm/kernel/head.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <asm/memory.h>
2323
#include <asm/thread_info.h>
2424
#include <asm/pgtable.h>
25+
#include <asm/export.h>
2526

2627
#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_SEMIHOSTING)
2728
#include CONFIG_DEBUG_LL_INCLUDE
@@ -727,6 +728,8 @@ __pv_phys_pfn_offset:
727728
__pv_offset:
728729
.quad 0
729730
.size __pv_offset, . -__pv_offset
731+
EXPORT_SYMBOL(__pv_phys_pfn_offset)
732+
EXPORT_SYMBOL(__pv_offset)
730733
#endif
731734

732735
#include "head-common.S"

‎arch/arm/kernel/smccc-call.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <asm/opcodes-sec.h>
1717
#include <asm/opcodes-virt.h>
1818
#include <asm/unwind.h>
19+
#include <asm/export.h>
1920

2021
/*
2122
* Wrap c macros in asm macros to delay expansion until after the
@@ -51,6 +52,7 @@ UNWIND( .fnend)
5152
ENTRY(arm_smccc_smc)
5253
SMCCC SMCCC_SMC
5354
ENDPROC(arm_smccc_smc)
55+
EXPORT_SYMBOL(arm_smccc_smc)
5456

5557
/*
5658
* void smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2,
@@ -60,3 +62,4 @@ ENDPROC(arm_smccc_smc)
6062
ENTRY(arm_smccc_hvc)
6163
SMCCC SMCCC_HVC
6264
ENDPROC(arm_smccc_hvc)
65+
EXPORT_SYMBOL(arm_smccc_hvc)

‎arch/arm/lib/ashldi3.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Boston, MA 02110-1301, USA. */
2828

2929
#include <linux/linkage.h>
3030
#include <asm/assembler.h>
31+
#include <asm/export.h>
3132

3233
#ifdef __ARMEB__
3334
#define al r1
@@ -52,3 +53,5 @@ ENTRY(__aeabi_llsl)
5253

5354
ENDPROC(__ashldi3)
5455
ENDPROC(__aeabi_llsl)
56+
EXPORT_SYMBOL(__ashldi3)
57+
EXPORT_SYMBOL(__aeabi_llsl)

‎arch/arm/lib/ashrdi3.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Boston, MA 02110-1301, USA. */
2828

2929
#include <linux/linkage.h>
3030
#include <asm/assembler.h>
31+
#include <asm/export.h>
3132

3233
#ifdef __ARMEB__
3334
#define al r1
@@ -52,3 +53,5 @@ ENTRY(__aeabi_lasr)
5253

5354
ENDPROC(__ashrdi3)
5455
ENDPROC(__aeabi_lasr)
56+
EXPORT_SYMBOL(__ashrdi3)
57+
EXPORT_SYMBOL(__aeabi_lasr)

‎arch/arm/lib/bitops.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <asm/assembler.h>
22
#include <asm/unwind.h>
3+
#include <asm/export.h>
34

45
#if __LINUX_ARM_ARCH__ >= 6
56
.macro bitop, name, instr
@@ -25,6 +26,7 @@ UNWIND( .fnstart )
2526
bx lr
2627
UNWIND( .fnend )
2728
ENDPROC(\name )
29+
EXPORT_SYMBOL(\name )
2830
.endm
2931

3032
.macro testop, name, instr, store
@@ -55,6 +57,7 @@ UNWIND( .fnstart )
5557
2: bx lr
5658
UNWIND( .fnend )
5759
ENDPROC(\name )
60+
EXPORT_SYMBOL(\name )
5861
.endm
5962
#else
6063
.macro bitop, name, instr
@@ -74,6 +77,7 @@ UNWIND( .fnstart )
7477
ret lr
7578
UNWIND( .fnend )
7679
ENDPROC(\name )
80+
EXPORT_SYMBOL(\name )
7781
.endm
7882

7983
/**
@@ -102,5 +106,6 @@ UNWIND( .fnstart )
102106
ret lr
103107
UNWIND( .fnend )
104108
ENDPROC(\name )
109+
EXPORT_SYMBOL(\name )
105110
.endm
106111
#endif

‎arch/arm/lib/bswapsdi2.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <linux/linkage.h>
22
#include <asm/assembler.h>
3+
#include <asm/export.h>
34

45
#if __LINUX_ARM_ARCH__ >= 6
56
ENTRY(__bswapsi2)
@@ -35,3 +36,5 @@ ENTRY(__bswapdi2)
3536
ret lr
3637
ENDPROC(__bswapdi2)
3738
#endif
39+
EXPORT_SYMBOL(__bswapsi2)
40+
EXPORT_SYMBOL(__bswapdi2)

‎arch/arm/lib/clear_user.S

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/linkage.h>
1111
#include <asm/assembler.h>
1212
#include <asm/unwind.h>
13+
#include <asm/export.h>
1314

1415
.text
1516

@@ -50,6 +51,9 @@ USER( strnebt r2, [r0])
5051
UNWIND(.fnend)
5152
ENDPROC(arm_clear_user)
5253
ENDPROC(__clear_user_std)
54+
#ifndef CONFIG_UACCESS_WITH_MEMCPY
55+
EXPORT_SYMBOL(arm_clear_user)
56+
#endif
5357

5458
.pushsection .text.fixup,"ax"
5559
.align 0

‎arch/arm/lib/copy_from_user.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/linkage.h>
1414
#include <asm/assembler.h>
1515
#include <asm/unwind.h>
16+
#include <asm/export.h>
1617

1718
/*
1819
* Prototype:
@@ -94,6 +95,7 @@ ENTRY(arm_copy_from_user)
9495
#include "copy_template.S"
9596

9697
ENDPROC(arm_copy_from_user)
98+
EXPORT_SYMBOL(arm_copy_from_user)
9799

98100
.pushsection .fixup,"ax"
99101
.align 0

‎arch/arm/lib/copy_page.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <asm/assembler.h>
1414
#include <asm/asm-offsets.h>
1515
#include <asm/cache.h>
16+
#include <asm/export.h>
1617

1718
#define COPY_COUNT (PAGE_SZ / (2 * L1_CACHE_BYTES) PLD( -1 ))
1819

@@ -45,3 +46,4 @@ ENTRY(copy_page)
4546
PLD( beq 2b )
4647
ldmfd sp!, {r4, pc} @ 3
4748
ENDPROC(copy_page)
49+
EXPORT_SYMBOL(copy_page)

0 commit comments

Comments
 (0)