tree 8fa622de344229ae27cec1bda93381817ba6a82c
parent c4bbb39806cf4098d7a01a779b40171047004046
parent c4ce0da8ec62d83c96e29db7dadd6d3985344bb3
author Linus Torvalds <torvalds@linux-foundation.org> 1424797541 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1424797541 -0800

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

Pull livepatching fixes from Jiri Kosina:
 "Two tiny fixes for livepatching infrastructure:

   - extending RCU critical section to cover all accessess to
     RCU-protected variable, by Petr Mladek

   - proper format string passing to kobject_init_and_add(), by Jiri
     Kosina"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: RCU protect struct klp_func all the time when used in klp_ftrace_handler()
  livepatch: fix format string in kobject_init_and_add()