Commit 74f3ae74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'module' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 

* 'module' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  modpost: fix segfault with short symbol names
  module: handle ppc64 relocating kcrctabs when CONFIG_RELOCATABLE=y
  Kbuild: clear marker out of modpost
  module: make MODULE_SYMBOL_PREFIX into a CONFIG option
  ARM: unexport symbols used to implement floating point emulation
  ARM: use unified discard definition in linker script
  x86: don't export inline function
  sparc64: don't export static inline pci_ functions
parents d8bef0bb 8d99513c

arch/arm/kernel/armksyms.c

+0 −20
Original line number Diff line number Diff line
@@ -48,27 +48,7 @@ extern void __aeabi_uidivmod(void); 
extern void __aeabi_ulcmp(void);



extern void fpundefinstr(void);

extern void fp_enter(void);



/*

 * This has a special calling convention; it doesn't

 * modify any of the usual registers, except for LR.

 */

#define EXPORT_CRC_ALIAS(sym) __CRC_SYMBOL(sym, "")



#define EXPORT_SYMBOL_ALIAS(sym,orig)		\

 EXPORT_CRC_ALIAS(sym)				\

 static const struct kernel_symbol __ksymtab_##sym	\

  __used __attribute__((section("__ksymtab"))) =	\

    { (unsigned long)&orig, #sym };



/*

 * floating point math emulator support.

 * These symbols will never change their calling convention...

 */

EXPORT_SYMBOL_ALIAS(kern_fp_enter,fp_enter);

EXPORT_SYMBOL_ALIAS(fp_printk,printk);

EXPORT_SYMBOL_ALIAS(fp_send_sig,send_sig);



EXPORT_SYMBOL(__backtrace);

arch/arm/kernel/vmlinux.lds.S

+8 −5
Original line number Diff line number Diff line
@@ -65,11 +65,11 @@ SECTIONS 
	__init_end = .;

#endif



	/DISCARD/ : {			/* Exit code and data		*/

		EXIT_TEXT

		EXIT_DATA

		*(.exitcall.exit)

		*(.discard)

	/*

	 * unwind exit sections must be discarded before the rest of the

	 * unwind sections get included.

	 */

	/DISCARD/ : {

		*(.ARM.exidx.exit.text)

		*(.ARM.extab.exit.text)

#ifndef CONFIG_HOTPLUG_CPU
@@ -238,6 +238,9 @@ SECTIONS 


	STABS_DEBUG

	.comment 0 : { *(.comment) }



	/* Default discards */

	DISCARDS

}



/*

arch/blackfin/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 


mainmenu "Blackfin Kernel Configuration"



config SYMBOL_PREFIX

	string

	default "_"



config MMU

	def_bool n

arch/blackfin/include/asm/module.h

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
#ifndef _ASM_BFIN_MODULE_H

#define _ASM_BFIN_MODULE_H



#define MODULE_SYMBOL_PREFIX "_"



#define Elf_Shdr        Elf32_Shdr

#define Elf_Sym         Elf32_Sym

#define Elf_Ehdr        Elf32_Ehdr

arch/blackfin/kernel/vmlinux.lds.S

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
 * Licensed under the GPL-2 or later

 */



#define VMLINUX_SYMBOL(_sym_) _##_sym_



#include <asm-generic/vmlinux.lds.h>

#include <asm/mem_map.h>

#include <asm/page.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE