tracing/kmemtrace: Use the %pf format
authorFrederic Weisbecker <fweisbec@gmail.com>
Thu, 9 Jul 2009 02:46:30 +0000 (04:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Jul 2009 10:07:20 +0000 (12:07 +0200)
Remove the obsolete seq_print_ip_sym() usage and replace it
by the %pf format in order to print function symbols.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
LKML-Reference: <1247107590-6428-3-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/kmemtrace.c

index 74903b6..2f6fa47 100644 (file)
@@ -389,19 +389,12 @@ kmemtrace_print_alloc_compress(struct trace_iterator *iter)
        if (!ret)
                return TRACE_TYPE_PARTIAL_LINE;
 
-       /* Node */
-       ret = trace_seq_printf(s, "%4d   ", entry->node);
+       /* Node and call site*/
+       ret = trace_seq_printf(s, "%4d   %pf\n", entry->node,
+                                                (void *)entry->call_site);
        if (!ret)
                return TRACE_TYPE_PARTIAL_LINE;
 
-       /* Call site */
-       ret = seq_print_ip_sym(s, entry->call_site, 0);
-       if (!ret)
-               return TRACE_TYPE_PARTIAL_LINE;
-
-       if (!trace_seq_printf(s, "\n"))
-               return TRACE_TYPE_PARTIAL_LINE;
-
        return TRACE_TYPE_HANDLED;
 }
 
@@ -447,19 +440,11 @@ kmemtrace_print_free_compress(struct trace_iterator *iter)
        if (!ret)
                return TRACE_TYPE_PARTIAL_LINE;
 
-       /* Skip node */
-       ret = trace_seq_printf(s, "       ");
+       /* Skip node and print call site*/
+       ret = trace_seq_printf(s, "       %pf\n", (void *)entry->call_site);
        if (!ret)
                return TRACE_TYPE_PARTIAL_LINE;
 
-       /* Call site */
-       ret = seq_print_ip_sym(s, entry->call_site, 0);
-       if (!ret)
-               return TRACE_TYPE_PARTIAL_LINE;
-
-       if (!trace_seq_printf(s, "\n"))
-               return TRACE_TYPE_PARTIAL_LINE;
-
        return TRACE_TYPE_HANDLED;
 }