Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e1b9b80 authored by Alan Jenkins's avatar Alan Jenkins Committed by Rusty Russell
Browse files

module: make MODULE_SYMBOL_PREFIX into a CONFIG option 



The next commit will require the use of MODULE_SYMBOL_PREFIX in
.tmp_exports-asm.S.  Currently it is mixed in with C structure
definitions in "asm/module.h".  Move the definition of this arch option
into Kconfig, so it can be easily accessed by any code.

This also lets modpost.c use the same definition.  Previously modpost
relied on a hardcoded list of architectures in mk_elfconfig.c.

A build test for blackfin, one of the two MODULE_SYMBOL_PREFIX archs,
showed the generated code was unchanged.  vmlinux was identical save
for build ids, and an apparently randomized suffix on a single "__key"
symbol in the kallsyms data).

Signed-off-by: default avatarAlan Jenkins <alan-jenkins@tuffmail.co.uk>
Acked-by: Mike Frysinger <vapier@gentoo.org> (blackfin)
CC: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 3e7b19ef

arch/blackfin/Kconfig

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




mainmenu "Blackfin Kernel Configuration"

mainmenu "Blackfin Kernel Configuration"





config SYMBOL_PREFIX

	string

	default "_"



config MMU

config MMU

	def_bool n

	def_bool n

arch/blackfin/include/asm/module.h

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

#ifndef _ASM_BFIN_MODULE_H

#define _ASM_BFIN_MODULE_H

#define _ASM_BFIN_MODULE_H





#define MODULE_SYMBOL_PREFIX "_"



#define Elf_Shdr        Elf32_Shdr

#define Elf_Shdr        Elf32_Shdr

#define Elf_Sym         Elf32_Sym

#define Elf_Sym         Elf32_Sym

#define Elf_Ehdr        Elf32_Ehdr

#define Elf_Ehdr        Elf32_Ehdr

arch/blackfin/kernel/vmlinux.lds.S

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

 * Licensed under the GPL-2 or later

 */

 */





#define VMLINUX_SYMBOL(_sym_) _##_sym_



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

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

#include <asm/mem_map.h>

#include <asm/mem_map.h>

#include <asm/page.h>

#include <asm/page.h>

arch/h8300/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,10 @@ config H8300 
	default y

	default y

	select HAVE_IDE

	select HAVE_IDE





config SYMBOL_PREFIX

	string

	default "_"



config MMU

config MMU

	bool

	bool

	default n

	default n

arch/h8300/include/asm/module.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -8,6 +8,4 @@ struct mod_arch_specific { }; 
#define Elf_Sym Elf32_Sym

#define Elf_Sym Elf32_Sym

#define Elf_Ehdr Elf32_Ehdr

#define Elf_Ehdr Elf32_Ehdr





#define MODULE_SYMBOL_PREFIX "_"



#endif /* _ASM_H8/300_MODULE_H */
 
#endif /* _ASM_H8/300_MODULE_H */