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/kernel/module.c | |
| parent | 61bf12d3304d78ff499245ea995858c3bedb162e (diff) | |
| parent | 85baa095497f3e590df9f6c8932121f123efca5c (diff) | |
| download | kernel_replicant_linux-4d4fb97a62105c07dcccd350c391a65f576726c4.tar.gz kernel_replicant_linux-4d4fb97a62105c07dcccd350c391a65f576726c4.tar.bz2 kernel_replicant_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/kernel/module.c')
| -rw-r--r-- | arch/powerpc/kernel/module.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c index 9547381b631a..d1f1b35bf0c7 100644 --- a/arch/powerpc/kernel/module.c +++ b/arch/powerpc/kernel/module.c @@ -47,6 +47,11 @@ int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, struct module *me) { const Elf_Shdr *sect; + int rc; + + rc = module_finalize_ftrace(me, sechdrs); + if (rc) + return rc; /* Apply feature fixups */ sect = find_section(hdr, sechdrs, "__ftr_fixup"); |