diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2008-06-23 21:32:28 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-06-30 21:28:20 -0400 |
commit | 07630a37beefe8e4401c602f04e3e5bcbba50b31 (patch) | |
tree | 7e7c7b76abe634eeebb1b161ebfbd18638af2149 /include | |
parent | 053a858efa46c9ab86363b271374ec02ad2af753 (diff) |
powerpc: Add ppc_function_entry() which gets the entry point for a function
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 <michael@ellerman.id.au>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r-- | 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 fdb187cbc40d..a45a7ff78725 100644 --- a/include/asm-powerpc/code-patching.h +++ b/include/asm-powerpc/code-patching.h | |||
@@ -10,6 +10,8 @@ | |||
10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <asm/types.h> | ||
14 | |||
13 | /* Flags for create_branch: | 15 | /* Flags for create_branch: |
14 | * "b" == create_branch(addr, target, 0); | 16 | * "b" == create_branch(addr, target, 0); |
15 | * "ba" == create_branch(addr, target, BRANCH_ABSOLUTE); | 17 | * "ba" == create_branch(addr, target, BRANCH_ABSOLUTE); |
@@ -24,4 +26,18 @@ unsigned int create_branch(const unsigned int *addr, | |||
24 | void patch_branch(unsigned int *addr, unsigned long target, int flags); | 26 | void patch_branch(unsigned int *addr, unsigned long target, int flags); |
25 | void patch_instruction(unsigned int *addr, unsigned int instr); | 27 | void patch_instruction(unsigned int *addr, unsigned int instr); |
26 | 28 | ||
29 | static inline unsigned long ppc_function_entry(void *func) | ||
30 | { | ||
31 | #ifdef CONFIG_PPC64 | ||
32 | /* | ||
33 | * On PPC64 the function pointer actually points to the function's | ||
34 | * descriptor. The first entry in the descriptor is the address | ||
35 | * of the function text. | ||
36 | */ | ||
37 | return ((func_descr_t *)func)->entry; | ||
38 | #else | ||
39 | return (unsigned long)func; | ||
40 | #endif | ||
41 | } | ||
42 | |||
27 | #endif /* _ASM_POWERPC_CODE_PATCHING_H */ | 43 | #endif /* _ASM_POWERPC_CODE_PATCHING_H */ |