Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 0f0836b7
    Linus Torvalds authored
    
    
    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: default avatarMiroslav 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
    0f0836b7