summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhishek Sagar <sagar.abhishek@gmail.com>2008-06-01 21:47:42 +0530
committerIngo Molnar <mingo@elte.hu>2008-06-10 11:57:49 +0200
commit1d74f2a0f64b4091e5e91b55ac1b17dff93f4b59 (patch)
tree8777ee5d38cf27939687adf2dc3d2a9a5f60b33d
parent0eb967012ea15e6e8cfab483d9fa37bc602d400c (diff)
ftrace: remove ftrace_ip_converted()
Remove the unneeded function ftrace_ip_converted(). Signed-off-by: Abhishek Sagar <sagar.abhishek@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/arm/kernel/ftrace.c10
-rw-r--r--arch/powerpc/kernel/ftrace.c10
-rw-r--r--arch/sparc64/kernel/ftrace.c7
-rw-r--r--arch/x86/kernel/ftrace.c10
-rw-r--r--kernel/trace/ftrace.c7
5 files changed, 0 insertions, 44 deletions
diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
index f4cb4cc3fa0c..22f3d6e309f9 100644
--- a/arch/arm/kernel/ftrace.c
+++ b/arch/arm/kernel/ftrace.c
@@ -22,16 +22,6 @@
static unsigned long bl_insn;
static const unsigned long NOP = 0xe1a00000; /* mov r0, r0 */
-/* return true if mcount call site is already patched/no-op'ed */
-int ftrace_ip_converted(unsigned long pc)
-{
- unsigned long save;
-
- pc -= INSN_SIZE;
- save = *(unsigned long *)pc;
- return save == NOP;
-}
-
unsigned char *ftrace_nop_replace(void)
{
return (char *)&NOP;
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index 69ed41223468..e12c593ab9ca 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -27,16 +27,6 @@ static unsigned int ftrace_nop = 0x60000000;
# define GET_ADDR(addr) *(unsigned long *)addr
#endif
-notrace int ftrace_ip_converted(unsigned long ip)
-{
- unsigned int save;
-
- ip -= CALL_BACK;
- save = *(unsigned int *)ip;
-
- return save == ftrace_nop;
-}
-
static unsigned int notrace ftrace_calc_offset(long ip, long addr)
{
return (int)((addr + CALL_BACK) - ip);
diff --git a/arch/sparc64/kernel/ftrace.c b/arch/sparc64/kernel/ftrace.c
index f449e6df6c4a..c17373195b1e 100644
--- a/arch/sparc64/kernel/ftrace.c
+++ b/arch/sparc64/kernel/ftrace.c
@@ -7,13 +7,6 @@
static const u32 ftrace_nop = 0x01000000;
-notrace int ftrace_ip_converted(unsigned long ip)
-{
- u32 insn = *(u32 *) ip;
-
- return (insn == ftrace_nop);
-}
-
notrace unsigned char *ftrace_nop_replace(void)
{
return (char *)&ftrace_nop;
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 498608c015fb..bc5cf8d46742 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -31,16 +31,6 @@ union ftrace_code_union {
} __attribute__((packed));
};
-notrace int ftrace_ip_converted(unsigned long ip)
-{
- unsigned long save;
-
- ip -= CALL_BACK;
- save = *(long *)ip;
-
- return save == *ftrace_nop;
-}
-
static int notrace ftrace_calc_offset(long ip, long addr)
{
return (int)(addr - ip);
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index ec54cb7d69d6..a8929e4c77c1 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -306,13 +306,6 @@ ftrace_record_ip(unsigned long ip)
if (ftrace_ip_in_hash(ip, key))
goto out_unlock;
- /*
- * There's a slight race that the ftraced will update the
- * hash and reset here. If it is already converted, skip it.
- */
- if (ftrace_ip_converted(ip))
- goto out_unlock;
-
node = ftrace_alloc_dyn_node(ip);
if (!node)
goto out_unlock;