From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Jan 2016 00:38:02 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0f0836b7eb1b9d14862ee40c7856227a3ead70db;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/livepatching

Pull livepatching updates from Jiri Kosina:

 - RO/NX attribute fixes for patch module relocations from Josh
   Poimboeuf.  As part of this effort, module.c has been cleaned up as
   well and livepatching is piggy-backing on this cleanup.  Rusty is OK
   with this whole lot going through livepatching tree.

 - symbol disambiguation support from Chris J Arges.  That series is
   also

        Reviewed-by: Miroslav Benes <mbenes@suse.cz>

   but this came in only after I've alredy pushed out.  Didn't want to
   rebase because of that, hence I am mentioning it here.

 - symbol lookup fix from Miroslav Benes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: Cleanup module page permission changes
  module: keep percpu symbols in module's symtab
  module: clean up RO/NX handling.
  module: use a structure to encapsulate layout.
  gcov: use within_module() helper.
  module: Use the same logic for setting and unsetting RO/NX
  livepatch: function,sympos scheme in livepatch sysfs directory
  livepatch: add sympos as disambiguator field to klp_reloc
  livepatch: add old_sympos as disambiguator field to klp_func
---

0f0836b7eb1b9d14862ee40c7856227a3ead70db
diff --cc kernel/module.c
index 38c7bd5583ff,912e891e0e2f..8358f4697c0c
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -3571,14 -3552,8 +3552,14 @@@ static int load_module(struct load_inf
  	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->module_core, mod->core_size);
+ 	lockdep_free_key_range(mod->core_layout.base, mod->core_layout.size);
  
  	module_deallocate(mod, info);
   free_copy: