Commit f8ce1faf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull mudule updates from Rusty Russell:
 "We get rid of the general module prefix confusion with a binary config
  option, fix a remove/insert race which Never Happens, and (my
  favorite) handle the case when we have too many modules for a single
  commandline.  Seriously, the kernel is full, please go away!"

* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  modpost: fix unwanted VMLINUX_SYMBOL_STR expansion
  X.509: Support parse long form of length octets in Authority Key Identifier
  module: don't unlink the module until we've removed all exposure.
  kernel: kallsyms: memory override issue, need check destination buffer length
  MODSIGN: do not send garbage to stderr when enabling modules signature
  modpost: handle huge numbers of modules.
  modpost: add -T option to read module names from file/stdin.
  modpost: minor cleanup.
  genksyms: pass symbol-prefix instead of arch
  module: fix symbol versioning with symbol prefixes
  CONFIG_SYMBOL_PREFIX: cleanup.
parents 24d0c254 a53a11f3

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1399,7 +1399,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) 
# Run depmod only if we have System.map and depmod is executable

quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)

      cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \

                   $(KERNELRELEASE) "$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))"

                   $(KERNELRELEASE) "$(patsubst y,_,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))"



# Create temporary dir for module support files

# clean it up only when building all modules

arch/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -381,6 +381,12 @@ config MODULES_USE_ELF_REL 
	  Modules only use ELF REL relocations.  Modules with ELF RELA

	  relocations will give an error.



config HAVE_UNDERSCORE_SYMBOL_PREFIX

	bool

	help

	  Some architectures generate an _ in front of C symbols; things like

	  module loading and assembly files need to know about this.



#

# ABI hall of shame

#

arch/blackfin/Kconfig

+1 −4
Original line number Diff line number Diff line 
config SYMBOL_PREFIX

	string

	default "_"



config MMU

	def_bool n
@@ -33,6 +29,7 @@ config BLACKFIN 
	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select HAVE_UID16

	select HAVE_UNDERSCORE_SYMBOL_PREFIX

	select VIRT_TO_BUS

	select ARCH_WANT_IPC_PARSE_VERSION

	select HAVE_GENERIC_HARDIRQS

arch/h8300/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -12,10 +12,7 @@ config H8300 
	select MODULES_USE_ELF_RELA

	select OLD_SIGSUSPEND3

	select OLD_SIGACTION



config SYMBOL_PREFIX

	string

	default "_"

	select HAVE_UNDERSCORE_SYMBOL_PREFIX



config MMU

	bool

arch/metag/Kconfig

+1 −4
Original line number Diff line number Diff line 
config SYMBOL_PREFIX

	string

	default "_"



config METAG

	def_bool y

	select EMBEDDED
@@ -28,6 +24,7 @@ config METAG 
	select HAVE_OPROFILE

	select HAVE_PERF_EVENTS

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_UNDERSCORE_SYMBOL_PREFIX

	select IRQ_DOMAIN

	select MODULES_USE_ELF_RELA

	select OF

CRA Git | Maintained and supported by SUSTech CRA and CCSE