Commit 8478132a authored by Russell King's avatar Russell King
Browse files

Revert "arm: move exports to definitions" 



This reverts commit 4dd1837d.

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: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 2a381106

arch/arm/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ generic-y += early_ioremap.h 
generic-y += emergency-restart.h

generic-y += errno.h

generic-y += exec.h

generic-y += export.h

generic-y += ioctl.h

generic-y += ipcbuf.h

generic-y += irq_regs.h

arch/arm/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ endif 
obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o

obj-$(CONFIG_ISA_DMA_API)	+= dma.o

obj-$(CONFIG_FIQ)		+= fiq.o fiqasm.o

obj-$(CONFIG_MODULES)		+= module.o

obj-$(CONFIG_MODULES)		+= armksyms.o module.o

obj-$(CONFIG_ARM_MODULE_PLTS)	+= module-plts.o

obj-$(CONFIG_ISA_DMA)		+= dma-isa.o

obj-$(CONFIG_PCI)		+= bios32.o isa.o

arch/arm/kernel/armksyms.c

0 → 100644
+183 −0
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/kernel/armksyms.c

 *

 *  Copyright (C) 2000 Russell King

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/export.h>

#include <linux/sched.h>

#include <linux/string.h>

#include <linux/cryptohash.h>

#include <linux/delay.h>

#include <linux/in6.h>

#include <linux/syscalls.h>

#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/arm-smccc.h>



#include <asm/checksum.h>

#include <asm/ftrace.h>



/*

 * libgcc functions - functions that are used internally by the

 * compiler...  (prototypes are not correct though, but that

 * doesn't really matter since they're not versioned).

 */

extern void __ashldi3(void);

extern void __ashrdi3(void);

extern void __divsi3(void);

extern void __lshrdi3(void);

extern void __modsi3(void);

extern void __muldi3(void);

extern void __ucmpdi2(void);

extern void __udivsi3(void);

extern void __umodsi3(void);

extern void __do_div64(void);

extern void __bswapsi2(void);

extern void __bswapdi2(void);



extern void __aeabi_idiv(void);

extern void __aeabi_idivmod(void);

extern void __aeabi_lasr(void);

extern void __aeabi_llsl(void);

extern void __aeabi_llsr(void);

extern void __aeabi_lmul(void);

extern void __aeabi_uidiv(void);

extern void __aeabi_uidivmod(void);

extern void __aeabi_ulcmp(void);



extern void fpundefinstr(void);



void mmioset(void *, unsigned int, size_t);

void mmiocpy(void *, const void *, size_t);



	/* platform dependent support */

EXPORT_SYMBOL(arm_delay_ops);



	/* networking */

EXPORT_SYMBOL(csum_partial);

EXPORT_SYMBOL(csum_partial_copy_from_user);

EXPORT_SYMBOL(csum_partial_copy_nocheck);

EXPORT_SYMBOL(__csum_ipv6_magic);



	/* io */

#ifndef __raw_readsb

EXPORT_SYMBOL(__raw_readsb);

#endif

#ifndef __raw_readsw

EXPORT_SYMBOL(__raw_readsw);

#endif

#ifndef __raw_readsl

EXPORT_SYMBOL(__raw_readsl);

#endif

#ifndef __raw_writesb

EXPORT_SYMBOL(__raw_writesb);

#endif

#ifndef __raw_writesw

EXPORT_SYMBOL(__raw_writesw);

#endif

#ifndef __raw_writesl

EXPORT_SYMBOL(__raw_writesl);

#endif



	/* string / mem functions */

EXPORT_SYMBOL(strchr);

EXPORT_SYMBOL(strrchr);

EXPORT_SYMBOL(memset);

EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(memmove);

EXPORT_SYMBOL(memchr);

EXPORT_SYMBOL(__memzero);



EXPORT_SYMBOL(mmioset);

EXPORT_SYMBOL(mmiocpy);



#ifdef CONFIG_MMU

EXPORT_SYMBOL(copy_page);



EXPORT_SYMBOL(arm_copy_from_user);

EXPORT_SYMBOL(arm_copy_to_user);

EXPORT_SYMBOL(arm_clear_user);



EXPORT_SYMBOL(__get_user_1);

EXPORT_SYMBOL(__get_user_2);

EXPORT_SYMBOL(__get_user_4);

EXPORT_SYMBOL(__get_user_8);



#ifdef __ARMEB__

EXPORT_SYMBOL(__get_user_64t_1);

EXPORT_SYMBOL(__get_user_64t_2);

EXPORT_SYMBOL(__get_user_64t_4);

EXPORT_SYMBOL(__get_user_32t_8);

#endif



EXPORT_SYMBOL(__put_user_1);

EXPORT_SYMBOL(__put_user_2);

EXPORT_SYMBOL(__put_user_4);

EXPORT_SYMBOL(__put_user_8);

#endif



	/* gcc lib functions */

EXPORT_SYMBOL(__ashldi3);

EXPORT_SYMBOL(__ashrdi3);

EXPORT_SYMBOL(__divsi3);

EXPORT_SYMBOL(__lshrdi3);

EXPORT_SYMBOL(__modsi3);

EXPORT_SYMBOL(__muldi3);

EXPORT_SYMBOL(__ucmpdi2);

EXPORT_SYMBOL(__udivsi3);

EXPORT_SYMBOL(__umodsi3);

EXPORT_SYMBOL(__do_div64);

EXPORT_SYMBOL(__bswapsi2);

EXPORT_SYMBOL(__bswapdi2);



#ifdef CONFIG_AEABI

EXPORT_SYMBOL(__aeabi_idiv);

EXPORT_SYMBOL(__aeabi_idivmod);

EXPORT_SYMBOL(__aeabi_lasr);

EXPORT_SYMBOL(__aeabi_llsl);

EXPORT_SYMBOL(__aeabi_llsr);

EXPORT_SYMBOL(__aeabi_lmul);

EXPORT_SYMBOL(__aeabi_uidiv);

EXPORT_SYMBOL(__aeabi_uidivmod);

EXPORT_SYMBOL(__aeabi_ulcmp);

#endif



	/* bitops */

EXPORT_SYMBOL(_set_bit);

EXPORT_SYMBOL(_test_and_set_bit);

EXPORT_SYMBOL(_clear_bit);

EXPORT_SYMBOL(_test_and_clear_bit);

EXPORT_SYMBOL(_change_bit);

EXPORT_SYMBOL(_test_and_change_bit);

EXPORT_SYMBOL(_find_first_zero_bit_le);

EXPORT_SYMBOL(_find_next_zero_bit_le);

EXPORT_SYMBOL(_find_first_bit_le);

EXPORT_SYMBOL(_find_next_bit_le);



#ifdef __ARMEB__

EXPORT_SYMBOL(_find_first_zero_bit_be);

EXPORT_SYMBOL(_find_next_zero_bit_be);

EXPORT_SYMBOL(_find_first_bit_be);

EXPORT_SYMBOL(_find_next_bit_be);

#endif



#ifdef CONFIG_FUNCTION_TRACER

#ifdef CONFIG_OLD_MCOUNT

EXPORT_SYMBOL(mcount);

#endif

EXPORT_SYMBOL(__gnu_mcount_nc);

#endif



#ifdef CONFIG_ARM_PATCH_PHYS_VIRT

EXPORT_SYMBOL(__pv_phys_pfn_offset);

EXPORT_SYMBOL(__pv_offset);

#endif



#ifdef CONFIG_HAVE_ARM_SMCCC

EXPORT_SYMBOL(arm_smccc_smc);

EXPORT_SYMBOL(arm_smccc_hvc);

#endif

arch/arm/kernel/entry-ftrace.S

+0 −3
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <asm/assembler.h>

#include <asm/ftrace.h>

#include <asm/unwind.h>

#include <asm/export.h>



#include "entry-header.S"
@@ -154,7 +153,6 @@ ENTRY(mcount) 
	__mcount _old

#endif

ENDPROC(mcount)

EXPORT_SYMBOL(mcount)



#ifdef CONFIG_DYNAMIC_FTRACE

ENTRY(ftrace_caller_old)
@@ -207,7 +205,6 @@ UNWIND(.fnstart) 
#endif

UNWIND(.fnend)

ENDPROC(__gnu_mcount_nc)

EXPORT_SYMBOL(__gnu_mcount_nc)



#ifdef CONFIG_DYNAMIC_FTRACE

ENTRY(ftrace_caller)

arch/arm/kernel/head.S

+0 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <asm/memory.h>

#include <asm/thread_info.h>

#include <asm/pgtable.h>

#include <asm/export.h>



#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_SEMIHOSTING)

#include CONFIG_DEBUG_LL_INCLUDE
@@ -728,8 +727,6 @@ __pv_phys_pfn_offset: 
__pv_offset:

	.quad	0

	.size	__pv_offset, . -__pv_offset

EXPORT_SYMBOL(__pv_phys_pfn_offset)

EXPORT_SYMBOL(__pv_offset)

#endif



#include "head-common.S"

CRA Git | Maintained and supported by SUSTech CRA and CCSE