diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2016-04-15 11:31:51 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-04-15 11:42:51 +0200 |
| commit | 4d4fb97a62105c07dcccd350c391a65f576726c4 (patch) | |
| tree | 36f5ba480d7ea790b8cedf7e49bebab781659f73 /arch/powerpc/include/asm/module.h | |
| parent | 61bf12d3304d78ff499245ea995858c3bedb162e (diff) | |
| parent | 85baa095497f3e590df9f6c8932121f123efca5c (diff) | |
| download | linux-4d4fb97a62105c07dcccd350c391a65f576726c4.tar.gz linux-4d4fb97a62105c07dcccd350c391a65f576726c4.tar.bz2 linux-4d4fb97a62105c07dcccd350c391a65f576726c4.zip | |
Merge branch 'topic/livepatch' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux into for-4.7/livepatching-ppc64le
Pull livepatching support for ppc64 architecture from Michael Ellerman.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'arch/powerpc/include/asm/module.h')
| -rw-r--r-- | arch/powerpc/include/asm/module.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/module.h b/arch/powerpc/include/asm/module.h index dcfcad139bcc..5b6b5a427b54 100644 --- a/arch/powerpc/include/asm/module.h +++ b/arch/powerpc/include/asm/module.h @@ -78,10 +78,18 @@ struct mod_arch_specific { # endif /* MODULE */ #endif -bool is_module_trampoline(u32 *insns); -int module_trampoline_target(struct module *mod, u32 *trampoline, +int module_trampoline_target(struct module *mod, unsigned long trampoline, unsigned long *target); +#ifdef CONFIG_DYNAMIC_FTRACE +int module_finalize_ftrace(struct module *mod, const Elf_Shdr *sechdrs); +#else +static inline int module_finalize_ftrace(struct module *mod, const Elf_Shdr *sechdrs) +{ + return 0; +} +#endif + struct exception_table_entry; void sort_ex_table(struct exception_table_entry *start, struct exception_table_entry *finish); |