From 904dd9bb9249fec9a3d9f5fb8bbbed42ad72e928 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Thu, 28 May 2009 19:33:36 +0000 Subject: [PATCH] --- yaml --- r: 149667 b: refs/heads/master c: 92e02a5125a22a4da58090c94f520432da700d73 h: refs/heads/master i: 149665: 73e41c0c572bed60824e1f72fa1dc6dc4a060176 149663: 8724a552a09ce618d5e7ee539aa5b9b7116a17c9 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/ftrace.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 34f3b391e81e..9f7c938862a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 898b160fe9d84b7e194c9ed0495193952909c9bd +refs/heads/master: 92e02a5125a22a4da58090c94f520432da700d73 diff --git a/trunk/arch/powerpc/kernel/ftrace.c b/trunk/arch/powerpc/kernel/ftrace.c index 429e21eaaf29..1b12696cca06 100644 --- a/trunk/arch/powerpc/kernel/ftrace.c +++ b/trunk/arch/powerpc/kernel/ftrace.c @@ -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) { @@ -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); } @@ -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); }