diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2020-02-17 10:34:34 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-02-17 10:34:34 +0100 |
| commit | 28f2aff1caa4997f58ca31179cad1b4a84a62827 (patch) | |
| tree | 69fb4b0a752f3660ce022a4313f8c7b276bbcceb /tools/perf/arch/arm/util/cs-etm.c | |
| parent | 3e8a3844fefbaad911c596f02dd48c39188ffa81 (diff) | |
| parent | 11a48a5a18c63fd7621bb050228cebf13566e4d8 (diff) | |
Merge v5.6-rc2 into drm-misc-next
Lyude needs some patches in 5.6-rc2 and we didn't bring drm-misc-next
forward yet, so it looks like a good occasion.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'tools/perf/arch/arm/util/cs-etm.c')
| -rw-r--r-- | tools/perf/arch/arm/util/cs-etm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/cs-etm.c index ede040cf82ad..2898cfdf8fe1 100644 --- a/tools/perf/arch/arm/util/cs-etm.c +++ b/tools/perf/arch/arm/util/cs-etm.c @@ -226,7 +226,7 @@ static int cs_etm_set_sink_attr(struct perf_pmu *pmu, if (term->type != PERF_EVSEL__CONFIG_TERM_DRV_CFG) continue; - sink = term->val.drv_cfg; + sink = term->val.str; snprintf(path, PATH_MAX, "sinks/%s", sink); ret = perf_pmu__scan_file(pmu, path, "%x", &hash); |