powerpc/module_64: Consolidate ftrace code

module_trampoline_target() is only used by ftrace. Move the prototype
within the appropriate #ifdef in the header. Also, move the function
body to the end of module_64.c so as to consolidate all ftrace code in
one place.

No functional changes.

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/2527351f65c53c5866068ae130dc34c5d4ee8ad9.1587488954.git.naveen.n.rao@linux.vnet.ibm.com

diff --git a/arch/powerpc/include/asm/module.h b/arch/powerpc/include/asm/module.h
index 3566587..6b99d77 100644 (file)
--- a/arch/powerpc/include/asm/module.h
+++ b/arch/powerpc/include/asm/module.h
@@ -90,12 +90,9 @@ struct mod_arch_specific {
 #    ifdef MODULE
        asm(".section .ftrace.tramp,\"ax\",@nobits; .align 3; .previous");
 #    endif     /* MODULE */
-#endif
 
 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)

diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
index f390451..0acec12 100644 (file)
--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c
@@ -145,42 +145,6 @@ static u32 ppc64_stub_insns[] = {
        PPC_INST_BCTR,
 };
 
-#ifdef CONFIG_DYNAMIC_FTRACE
-int module_trampoline_target(struct module *mod, unsigned long addr,
-                            unsigned long *target)
-{
-       struct ppc64_stub_entry *stub;
-       func_desc_t funcdata;
-       u32 magic;
-
-       if (!within_module_core(addr, mod)) {
-               pr_err("%s: stub %lx not in module %s\n", __func__, addr, mod->name);
-               return -EFAULT;
-       }
-
-       stub = (struct ppc64_stub_entry *)addr;
-
-       if (probe_kernel_read(&magic, &stub->magic, sizeof(magic))) {
-               pr_err("%s: fault reading magic for stub %lx for %s\n", __func__, addr, mod->name);
-               return -EFAULT;
-       }
-
-       if (magic != STUB_MAGIC) {
-               pr_err("%s: bad magic for stub %lx for %s\n", __func__, addr, mod->name);
-               return -EFAULT;
-       }
-
-       if (probe_kernel_read(&funcdata, &stub->funcdata, sizeof(funcdata))) {
-               pr_err("%s: fault reading funcdata for stub %lx for %s\n", __func__, addr, mod->name);
-                return -EFAULT;
-       }
-
-       *target = stub_func_addr(funcdata);
-
-       return 0;
-}
-#endif
-
 /* Count how many different 24-bit relocations (different symbol,
    different addend) */
 static unsigned int count_relocs(const Elf64_Rela *rela, unsigned int num)
@@ -731,6 +695,39 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
 }
 
 #ifdef CONFIG_DYNAMIC_FTRACE
+int module_trampoline_target(struct module *mod, unsigned long addr,
+                            unsigned long *target)
+{
+       struct ppc64_stub_entry *stub;
+       func_desc_t funcdata;
+       u32 magic;
+
+       if (!within_module_core(addr, mod)) {
+               pr_err("%s: stub %lx not in module %s\n", __func__, addr, mod->name);
+               return -EFAULT;
+       }
+
+       stub = (struct ppc64_stub_entry *)addr;
+
+       if (probe_kernel_read(&magic, &stub->magic, sizeof(magic))) {
+               pr_err("%s: fault reading magic for stub %lx for %s\n", __func__, addr, mod->name);
+               return -EFAULT;
+       }
+
+       if (magic != STUB_MAGIC) {
+               pr_err("%s: bad magic for stub %lx for %s\n", __func__, addr, mod->name);
+               return -EFAULT;
+       }
+
+       if (probe_kernel_read(&funcdata, &stub->funcdata, sizeof(funcdata))) {
+               pr_err("%s: fault reading funcdata for stub %lx for %s\n", __func__, addr, mod->name);
+                return -EFAULT;
+       }
+
+       *target = stub_func_addr(funcdata);
+
+       return 0;
+}
 
 #ifdef CONFIG_MPROFILE_KERNEL