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>

diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
index f4cb4cc3fa0c6eebf70a2de0a4e14aeb8c8df0c0..22f3d6e309f9f9ca1de820703c426601f83fee7d 100644 (file)
--- 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 69ed412234688464cbc49c0d71aa8d319285f431..e12c593ab9cacc94ceae3dcf8cf6d3953cf5c4e5 100644 (file)
--- 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 f449e6df6c4a492c62df58e68e8ab71201dc5c6d..c17373195b1e849306eb0127953e0862c49f6df6 100644 (file)
--- 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 498608c015fbe53bc6b4b6756f561b9ca94c0552..bc5cf8d46742fb476c6d330dcc9dd737e15fe5cf 100644 (file)
--- 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 ec54cb7d69d6bedcb35e9c9383d542086f5f3bba..a8929e4c77c1b6aed45e463ba639d40c22937151 100644 (file)
--- 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;