projects
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'trace-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...
[linux.git]
/
arch
/
powerpc
/
kernel
/
ftrace.c
diff --git
a/arch/powerpc/kernel/ftrace.c
b/arch/powerpc/kernel/ftrace.c
index 71ce4cbb7e9f268840369513ac411052a3d27d8b..6a014c763cc71da4a9a5fd523649f105bf5fdc10 100644
(file)
--- 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);