Skip to content

Commit

Permalink
powerpc/ftrace: Use PPC_INST_NOP directly
Browse files Browse the repository at this point in the history
There's no need to wrap PPC_INST_NOP in a static inline.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Michael Ellerman authored and Benjamin Herrenschmidt committed Jun 2, 2009
1 parent 898b160 commit 92e02a5
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions arch/powerpc/kernel/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@


#ifdef CONFIG_DYNAMIC_FTRACE
static unsigned int ftrace_nop_replace(void)
{
return PPC_INST_NOP;
}

static unsigned int
ftrace_call_replace(unsigned long ip, unsigned long addr, int link)
{
Expand Down Expand Up @@ -314,7 +309,7 @@ int ftrace_make_nop(struct module *mod,
if (test_24bit_addr(ip, addr)) {
/* within range */
old = ftrace_call_replace(ip, addr, 1);
new = ftrace_nop_replace();
new = PPC_INST_NOP;
return ftrace_modify_code(ip, old, new);
}

Expand Down Expand Up @@ -452,7 +447,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
*/
if (test_24bit_addr(ip, addr)) {
/* within range */
old = ftrace_nop_replace();
old = PPC_INST_NOP;
new = ftrace_call_replace(ip, addr, 1);
return ftrace_modify_code(ip, old, new);
}
Expand Down

0 comments on commit 92e02a5

Please sign in to comment.