commit bb1860efc817c18fce4112f25f51043e44346d1b upstream. When commit 6d578258b955 ("coresight: Make sysfs functional on topologies with per core sink") was merged to stable, this patch was a pre-requisite and got missed out leading to build breakages. When using the perf interface, sink selection using sysfs is deprecated. Signed-off-by: Linu Cherian <lcherian@xxxxxxxxxxx> Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx> Link: https://lore.kernel.org/r/20200916191737.4001561-14-mathieu.poirier@xxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Reported-by: kernel test robot <lkp@xxxxxxxxx> --- drivers/hwtracing/coresight/coresight-etm-perf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index be591b557df9..75379184f391 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -222,8 +222,6 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, if (event->attr.config2) { id = (u32)event->attr.config2; sink = coresight_get_sink_by_id(id); - } else { - sink = coresight_get_enabled_sink(true); } mask = &event_data->mask; -- 2.25.1