aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/ftrace.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-09-17 00:05:58 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-09-17 15:53:40 -0400
commitb375a11a239e9e1cac40c7f3ff28b343d9f7ac51 (patch)
treec69d29112ac9eb3689ddac166df65d06b268ad6d /kernel/trace/ftrace.c
parent91adcd2c4b104a8ce2973e6e84b01fd48735ffc6 (diff)
tracing: switch function prints from %pf to %ps
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>
Diffstat (limited to 'kernel/trace/ftrace.c')
-rw-r--r--kernel/trace/ftrace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index f7ab7fc162cc..cc615f84751b 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1405,7 +1405,7 @@ static int t_hash_show(struct seq_file *m, void *v)
1405 if (rec->ops->print) 1405 if (rec->ops->print)
1406 return rec->ops->print(m, rec->ip, rec->ops, rec->data); 1406 return rec->ops->print(m, rec->ip, rec->ops, rec->data);
1407 1407
1408 seq_printf(m, "%pf:%pf", (void *)rec->ip, (void *)rec->ops->func); 1408 seq_printf(m, "%ps:%ps", (void *)rec->ip, (void *)rec->ops->func);
1409 1409
1410 if (rec->data) 1410 if (rec->data)
1411 seq_printf(m, ":%p", rec->data); 1411 seq_printf(m, ":%p", rec->data);
@@ -1515,7 +1515,7 @@ static int t_show(struct seq_file *m, void *v)
1515 if (!rec) 1515 if (!rec)
1516 return 0; 1516 return 0;
1517 1517
1518 seq_printf(m, "%pf\n", (void *)rec->ip); 1518 seq_printf(m, "%ps\n", (void *)rec->ip);
1519 1519
1520 return 0; 1520 return 0;
1521} 1521}
@@ -2456,7 +2456,7 @@ static int g_show(struct seq_file *m, void *v)
2456 return 0; 2456 return 0;
2457 } 2457 }
2458 2458
2459 seq_printf(m, "%pf\n", (void *)*ptr); 2459 seq_printf(m, "%ps\n", (void *)*ptr);
2460 2460
2461 return 0; 2461 return 0;
2462} 2462}