diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 04:13:23 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 04:13:23 +0300 |
commit | 59da2a0630b8db5fa71fa5ca0052fd3fe3766d94 (patch) | |
tree | e3af6451f439ba2284a9c84f6976aa7e44b08fc9 /arch | |
parent | ebb4949eb32ff500602f960525592fc4e614c5a7 (diff) | |
parent | 372e2db7210df7c45ead46429aeb1443ba148060 (diff) | |
download | linux-59da2a0630b8db5fa71fa5ca0052fd3fe3766d94.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatching updates from Jiri Kosina:
- removal of dead code (Kamalesh Babulal)
- documentation update (Miroslav Benes)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
livepatch: doc: remove the limitation for schedule() patching
powerpc/livepatch: Remove klp_write_module_reloc() stub
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/include/asm/livepatch.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/powerpc/include/asm/livepatch.h b/arch/powerpc/include/asm/livepatch.h index a402f7f94896..47a03b9b528b 100644 --- a/arch/powerpc/include/asm/livepatch.h +++ b/arch/powerpc/include/asm/livepatch.h @@ -28,13 +28,6 @@ static inline int klp_check_compiler_support(void) return 0; } -static inline int klp_write_module_reloc(struct module *mod, unsigned long - type, unsigned long loc, unsigned long value) -{ - /* This requires infrastructure changes; we need the loadinfos. */ - return -ENOSYS; -} - static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) { regs->nip = ip; |