Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 0faef837
    Linus Torvalds authored
    Pull livepatching fixes from Jiri Kosina:
    
     - symbol lookup locking fix, from Miroslav Benes
    
     - error handling improvements in case of failure of the module coming
       notifier, from Minfei Huang
    
     - we were too pessimistic when kASLR has been enabled on x86 and were
       dropping address hints on the floor unnecessarily in such case.  Fix
       from Jiri Kosina
    
     - a few other small fixes and cleanups
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
      livepatch: add module locking around kallsyms calls
      livepatch: annotate klp_init() with __init
      livepatch: introduce patch/func-walking helpers
      livepatch: make kobject in klp_object statically allocated
      livepatch: Prevent patch inconsistencies if the coming module notifier fails
      livepatch: match return value to function signature
      x86: kaslr: fix build due to missing ALIGN definition
      livepatch: x86: make kASLR logic more accurate
      x86: introduce kaslr_offset()
    0faef837