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

Commit 581e400f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'modules-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux 

Pull modules updates from Jessica Yu:
 "Minor code cleanups and MAINTAINERS update"

* tag 'modules-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
  modpost: Remove trailing semicolon
  ftrace/module: Move ftrace_release_mod() to ddebug_cleanup label
  MAINTAINERS: Remove from module & paravirt maintenance
parents 6fbac201 0cad61d7

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -9280,7 +9280,6 @@ F: drivers/media/dvb-frontends/mn88473* 


MODULE SUPPORT

M:	Jessica Yu <jeyu@kernel.org>

M:	Rusty Russell <rusty@rustcorp.com.au>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next

S:	Maintained

F:	include/linux/module.h
@@ -10430,7 +10429,6 @@ F: Documentation/parport*.txt 
PARAVIRT_OPS INTERFACE

M:	Juergen Gross <jgross@suse.com>

M:	Alok Kataria <akataria@vmware.com>

M:	Rusty Russell <rusty@rustcorp.com.au>

L:	virtualization@lists.linux-foundation.org

S:	Supported

F:	Documentation/virtual/paravirt_ops.txt

kernel/module.c

+1 −6
Original line number Diff line number Diff line
@@ -3804,6 +3804,7 @@ static int load_module(struct load_info *info, const char __user *uargs, 
	module_disable_nx(mod);



 ddebug_cleanup:

	ftrace_release_mod(mod);

	dynamic_debug_remove(mod, info->debug);

	synchronize_sched();

	kfree(mod->args);
@@ -3823,12 +3824,6 @@ static int load_module(struct load_info *info, const char __user *uargs, 
	synchronize_sched();

	mutex_unlock(&module_mutex);

 free_module:

	/*

	 * Ftrace needs to clean up what it initialized.

	 * This does nothing if ftrace_module_init() wasn't called,

	 * but it must be called outside of module_mutex.

	 */

	ftrace_release_mod(mod);

	/* Free lock-classes; relies on the preceding sync_rcu() */

	lockdep_free_key_range(mod->core_layout.base, mod->core_layout.size);

scripts/mod/modpost.c

+1 −1
Original line number Diff line number Diff line
@@ -1685,7 +1685,7 @@ static void extable_mismatch_handler(const char* modname, struct elf_info *elf, 
static void check_section_mismatch(const char *modname, struct elf_info *elf,

				   Elf_Rela *r, Elf_Sym *sym, const char *fromsec)

{

	const char *tosec = sec_name(elf, get_secindex(elf, sym));;

	const char *tosec = sec_name(elf, get_secindex(elf, sym));

	const struct sectioncheck *mismatch = section_mismatch(fromsec, tosec);



	if (mismatch) {