summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2018-03-28 15:10:54 -0500
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2018-04-06 08:56:49 -0400
commit76690945f59e2f329f148e1266d9d13800629463 (patch)
tree8fe639151a54a19452dc2145862f9044c9922f41
parent0ae7961e75c3fe3383796323d5342cbda8f82536 (diff)
downloadlinux-stable-76690945f59e2f329f148e1266d9d13800629463.tar.gz
linux-stable-76690945f59e2f329f148e1266d9d13800629463.tar.bz2
linux-stable-76690945f59e2f329f148e1266d9d13800629463.zip
tracing: Don't add flag strings when displaying variable references
Variable references should never have flags appended when displayed - prevent that from happening. Before: # cat /sys/kernel/debug/tracing/events/sched/sched_switch/trigger hist:keys=next_pid:vals=hitcount:wakeup_lat=common_timestamp.usecs-$ts0.usecs:... After: hist:keys=next_pid:vals=hitcount:wakeup_lat=common_timestamp.usecs-$ts0:... Link: http://lkml.kernel.org/r/913318a5610ef6b24af2522575f671fa6ee19b6b.1522256721.git.tom.zanussi@linux.intel.com Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--kernel/trace/trace_events_hist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 4f4792f4c83f..d867502a56ba 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -2052,7 +2052,7 @@ static void expr_field_str(struct hist_field *field, char *expr)
strcat(expr, hist_field_name(field, 0));
- if (field->flags) {
+ if (field->flags && !(field->flags & HIST_FIELD_FL_VAR_REF)) {
const char *flags_str = get_hist_field_flags(field);
if (flags_str) {