diff options
| author | Liu Ping Fan <kernelfans@gmail.com> | 2014-02-26 03:23:01 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-02-28 08:06:25 +0100 |
| commit | a95fc58549e8f462e560868a16b1fa97b12d5db6 (patch) | |
| tree | ba75bfff830656fef1b4647ab2dc4663320896f1 /arch/powerpc/kernel/ftrace.c | |
| parent | powerpc/crashdump : Fix page frame number check in copy_oldmem_page (diff) | |
| download | linux-a95fc58549e8f462e560868a16b1fa97b12d5db6.tar.xz linux-a95fc58549e8f462e560868a16b1fa97b12d5db6.zip | |
powerpc/ftrace: bugfix for test_24bit_addr
The branch target should be the func addr, not the addr of func_descr_t.
So using ppc_function_entry() to generate the right target addr.
Signed-off-by: Liu Ping Fan <pingfank@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/kernel/ftrace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c index 9b27b293a922..b0ded97ee4e1 100644 --- a/arch/powerpc/kernel/ftrace.c +++ b/arch/powerpc/kernel/ftrace.c @@ -74,6 +74,7 @@ ftrace_modify_code(unsigned long ip, unsigned int old, unsigned int new) */ static int test_24bit_addr(unsigned long ip, unsigned long addr) { + addr = ppc_function_entry((void *)addr); /* use the create_branch to verify that this offset can be branched */ return create_branch((unsigned int *)ip, addr, 0); |