Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 01:54:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tracing: switch function prints from %pf to %ps

Browse Source 
For direct function pointers (like what mcount provides) PowerPC64
requires the use of %ps, otherwise nothing is printed.

This patch converts all prints of functions retrieved through mcount
to use the %ps format from the %pf.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt 2009-09-17 00:05:58 -04:00 committed by Steven Rostedt
parent 91adcd2c4b
commit b375a11a23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/trace/ftrace.c
View File

@ -1405,7 +1405,7 @@ static int t_hash_show(struct seq_file *m, void *v)
if (rec->ops->print) if (rec->ops->print)
return rec->ops->print(m, rec->ip, rec->ops, rec->data); return rec->ops->print(m, rec->ip, rec->ops, rec->data);
seq_printf(m, "%pf:%pf", (void *)rec->ip, (void *)rec->ops->func); seq_printf(m, "%ps:%ps", (void *)rec->ip, (void *)rec->ops->func);
if (rec->data) if (rec->data)
seq_printf(m, ":%p", rec->data); seq_printf(m, ":%p", rec->data);
@ -1515,7 +1515,7 @@ static int t_show(struct seq_file *m, void *v)
if (!rec) if (!rec)
return 0; return 0;
seq_printf(m, "%pf\n", (void *)rec->ip); seq_printf(m, "%ps\n", (void *)rec->ip);
return 0; return 0;
} }
@ -2456,7 +2456,7 @@ static int g_show(struct seq_file *m, void *v)
return 0; return 0;
} }
seq_printf(m, "%pf\n", (void *)*ptr); seq_printf(m, "%ps\n", (void *)*ptr);
return 0; return 0;
} }

2
kernel/trace/trace_functions.c
View File

@ -290,7 +290,7 @@ ftrace_trace_onoff_print(struct seq_file *m, unsigned long ip,
{ {
long count = (long)data; long count = (long)data;
seq_printf(m, "%pf:", (void *)ip); seq_printf(m, "%ps:", (void *)ip);
if (ops == &traceon_probe_ops) if (ops == &traceon_probe_ops)
seq_printf(m, "traceon"); seq_printf(m, "traceon");

6
kernel/trace/trace_functions_graph.c
View File

@ -124,7 +124,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
if (unlikely(current->ret_stack[index].fp != frame_pointer)) { if (unlikely(current->ret_stack[index].fp != frame_pointer)) {
ftrace_graph_stop(); ftrace_graph_stop();
WARN(1, "Bad frame pointer: expected %lx, received %lx\n" WARN(1, "Bad frame pointer: expected %lx, received %lx\n"
" from func %pF return to %lx\n", " from func %ps return to %lx\n",
current->ret_stack[index].fp, current->ret_stack[index].fp,
frame_pointer, frame_pointer,
(void *)current->ret_stack[index].func, (void *)current->ret_stack[index].func,
@ -669,7 +669,7 @@ print_graph_entry_leaf(struct trace_iterator *iter,
return TRACE_TYPE_PARTIAL_LINE; return TRACE_TYPE_PARTIAL_LINE;
} }
ret = trace_seq_printf(s, "%pf();\n", (void *)call->func); ret = trace_seq_printf(s, "%ps();\n", (void *)call->func);
if (!ret) if (!ret)
return TRACE_TYPE_PARTIAL_LINE; return TRACE_TYPE_PARTIAL_LINE;
@ -712,7 +712,7 @@ print_graph_entry_nested(struct trace_iterator *iter,
return TRACE_TYPE_PARTIAL_LINE; return TRACE_TYPE_PARTIAL_LINE;
} }
ret = trace_seq_printf(s, "%pf() {\n", (void *)call->func); ret = trace_seq_printf(s, "%ps() {\n", (void *)call->func);
if (!ret) if (!ret)
return TRACE_TYPE_PARTIAL_LINE; return TRACE_TYPE_PARTIAL_LINE;