xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Pull livepatching fixes from Jiri Kosina:

 - regression (from 4.4) fix for ordering issue, introduced by an
   earlier ftrace change, that broke live patching of modules.

   The fix replaces the ftrace module notifier by direct call in order
   to make the ordering guaranteed and well-defined.  The patch, from
   Jessica Yu, has been acked both by Steven and Rusty

 - error message fix from Miroslav Benes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  ftrace/module: remove ftrace module notifier
  livepatch: change the error message in asm/livepatch.h header files
This commit is contained in:
Linus Torvalds
2016-02-18 16:34:15 -08:00
parent dd8fc10e60 7dcd182bec
commit 705d43dbe1
5 changed files with 11 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/include/asm/livepatch.h
View File

@@ -37,7 +37,7 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
regs->psw.addr = ip;
}
#else
#error Live patching support is disabled; check CONFIG_LIVEPATCH
#error Include linux/livepatch.h, not asm/livepatch.h
#endif
#endif