[PATCH 4/6] Add ppc_function_entry() which gets the entry point for a function
From: Michael Ellerman <hidden>
Date: 2008-05-29 06:20:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
Because function pointers point to different things on 32-bit vs 64-bit, add a macro that deals with dereferencing the OPD on 64-bit. The soon to be merged ftrace wants this, as well as other code I am working on. Signed-off-by: Michael Ellerman <redacted> --- include/asm-powerpc/code-patching.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/include/asm-powerpc/code-patching.h b/include/asm-powerpc/code-patching.h
index 41ecae8..0213a48 100644
--- a/include/asm-powerpc/code-patching.h
+++ b/include/asm-powerpc/code-patching.h@@ -10,6 +10,8 @@ * 2 of the License, or (at your option) any later version. */ +#include <asm/types.h> + /* Flags for create_branch: * "b" == create_branch(addr, target, 0); * "ba" == create_branch(addr, target, BRANCH_ABSOLUTE);
@@ -23,4 +25,18 @@ unsigned int create_branch(unsigned long addr, unsigned long target, int flags); void patch_branch(unsigned long addr, unsigned long target, int flags); void patch_instruction(unsigned long addr, unsigned int instr); +static inline unsigned long ppc_function_entry(void *func) +{ +#ifdef CONFIG_PPC64 + /* + * On PPC64 the function pointer actually points to the function's + * descriptor. The first entry in the descriptor is the address + * of the function text. + */ + return ((func_descr_t *)func)->entry; +#else + return (unsigned long)func; +#endif +} + #endif /* _ASM_POWERPC_CODE_PATCHING_H */
--
1.5.5