Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

powerpc/ftrace: Use PPC_INST_NOP directly

Browse source 
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>
This commit is contained in:
Michael Ellerman 2009-05-28 19:33:36 +00:00 committed by Benjamin Herrenschmidt
parent 898b160fe9
commit 92e02a5125
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/powerpc/kernel/ftrace.c
View file

@ -25,11 +25,6 @@
#ifdef CONFIG_DYNAMIC_FTRACE #ifdef CONFIG_DYNAMIC_FTRACE
static unsigned int ftrace_nop_replace(void)
{
return PPC_INST_NOP;
}
static unsigned int static unsigned int
ftrace_call_replace(unsigned long ip, unsigned long addr, int link) ftrace_call_replace(unsigned long ip, unsigned long addr, int link)
{ {
@ -314,7 +309,7 @@ int ftrace_make_nop(struct module *mod,
if (test_24bit_addr(ip, addr)) { if (test_24bit_addr(ip, addr)) {
/* within range */ /* within range */
old = ftrace_call_replace(ip, addr, 1); old = ftrace_call_replace(ip, addr, 1);
new = ftrace_nop_replace(); new = PPC_INST_NOP;
return ftrace_modify_code(ip, old, new); return ftrace_modify_code(ip, old, new);
} }
@ -452,7 +447,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
*/ */
if (test_24bit_addr(ip, addr)) { if (test_24bit_addr(ip, addr)) {
/* within range */ /* within range */
old = ftrace_nop_replace(); old = PPC_INST_NOP;
new = ftrace_call_replace(ip, addr, 1); new = ftrace_call_replace(ip, addr, 1);
return ftrace_modify_code(ip, old, new); return ftrace_modify_code(ip, old, new);
} }