| Message ID | 20201116123510.28980-1-lcherian@marvell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [stable-5.9,1/2] coresight: etm: perf: Sink selection using sysfs is deprecated | expand |
On Mon, Nov 16, 2020 at 06:05:09PM +0530, Linu Cherian wrote: > 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@marvell.com> > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> > Link: https://lore.kernel.org/r/20200916191737.4001561-14-mathieu.poirier@linaro.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Reported-by: kernel test robot <lkp@intel.com> > --- > drivers/hwtracing/coresight/coresight-etm-perf.c | 2 -- > 1 file changed, 2 deletions(-) Both now queued up, thanks. greg k-h
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;
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@marvell.com> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Link: https://lore.kernel.org/r/20200916191737.4001561-14-mathieu.poirier@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reported-by: kernel test robot <lkp@intel.com> --- drivers/hwtracing/coresight/coresight-etm-perf.c | 2 -- 1 file changed, 2 deletions(-)