Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 121224
b: refs/heads/master
c: ec682ce
h: refs/heads/master
v: v3
  • Loading branch information
Steven Rostedt authored and Ingo Molnar committed Nov 28, 2008
1 parent c1c962c commit 5a00985
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d9af12b72bfe2a4efc1d347e0ac1c669b85dcea9
refs/heads/master: ec682cef2d2c1a25a198d32a87fe2649da671d1e
9 changes: 9 additions & 0 deletions trunk/arch/powerpc/kernel/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,9 @@ __ftrace_make_nop(struct module *mod,
if (probe_kernel_write((void *)ip, &op, MCOUNT_INSN_SIZE))
return -EPERM;


flush_icache_range(ip, ip + 8);

return 0;
}

Expand Down Expand Up @@ -342,6 +345,8 @@ __ftrace_make_nop(struct module *mod,
if (probe_kernel_write((void *)ip, &op, MCOUNT_INSN_SIZE))
return -EPERM;

flush_icache_range(ip, ip + 8);

return 0;
}
#endif /* PPC64 */
Expand Down Expand Up @@ -438,6 +443,8 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
if (probe_kernel_write((void *)ip, op, MCOUNT_INSN_SIZE * 2))
return -EPERM;

flush_icache_range(ip, ip + 8);

return 0;
}
#else
Expand Down Expand Up @@ -481,6 +488,8 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
if (probe_kernel_write((void *)ip, &op, MCOUNT_INSN_SIZE))
return -EPERM;

flush_icache_range(ip, ip + 8);

return 0;
}
#endif /* CONFIG_PPC64 */
Expand Down

0 comments on commit 5a00985

Please sign in to comment.