diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-17 21:45:05 +0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-17 21:45:05 +0300 |
commit | 056c1722014104b70d36fe71b683f71637f1a708 (patch) | |
tree | 8236ab2e3f32d9dd2f82ca6045a6f82bd1b0d1e9 /tools/perf/util/parse-events.c | |
parent | 8366f0d268c20929d82d4b1407bd4c6f9232bdec (diff) | |
parent | 5925fa68fe8244651b3f78a88c4af99190a88f0d (diff) | |
download | linux-056c1722014104b70d36fe71b683f71637f1a708.tar.xz |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/parse-events.c')
-rw-r--r-- | tools/perf/util/parse-events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index c4d2394e2b2d..667cbca1547a 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -411,7 +411,7 @@ static int add_event_tool(struct list_head *list, int *idx, return -ENOMEM; evsel->tool_event = tool_event; if (tool_event == PERF_TOOL_DURATION_TIME) - evsel->unit = strdup("ns"); + evsel->unit = "ns"; return 0; } |