On Tue, 5 May 2020 at 07:37, Leo Yan <leo....@linaro.org> wrote:
>
> The variable 'traceid_list' is defined in the header file cs-etm.h,
> if multiple C files include cs-etm.h the compiler might complaint for
> multiple definition of 'traceid_list'.
>
> To fix multiple definition error, move the definition of 'traceid_list'
> into cs-etm.c.
>
> Fixes: cd8bfd8c973e ("perf tools: Add processing of coresight metadata")
> Reported-by: Thomas Backlund <t...@mageia.org>
> Signed-off-by: Leo Yan <leo....@linaro.org>
> Reviewed-by: Mike Leach <mike.le...@linaro.org>
> Tested-by: Mike Leach <mike.le...@linaro.org>
> Tested-by: Thomas Backlund <t...@mageia.org>
> ---
> tools/perf/util/cs-etm.c | 3 +++
> tools/perf/util/cs-etm.h | 3 ---
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
> index 62d2f9b9ce1b..381d9708e9bd 100644
> --- a/tools/perf/util/cs-etm.c
> +++ b/tools/perf/util/cs-etm.c
> @@ -94,6 +94,9 @@ struct cs_etm_queue {
> struct cs_etm_traceid_queue **traceid_queues;
> };
>
> +/* RB tree for quick conversion between traceID and metadata pointers */
> +static struct intlist *traceid_list;
> +
> static int cs_etm__update_queues(struct cs_etm_auxtrace *etm);
> static int cs_etm__process_queues(struct cs_etm_auxtrace *etm);
> static int cs_etm__process_timeless_queues(struct cs_etm_auxtrace *etm,
> diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h
> index 650ecc2a6349..4ad925d6d799 100644
> --- a/tools/perf/util/cs-etm.h
> +++ b/tools/perf/util/cs-etm.h
> @@ -114,9 +114,6 @@ enum cs_etm_isa {
> CS_ETM_ISA_T32,
> };
>
> -/* RB tree for quick conversion between traceID and metadata pointers */
> -struct intlist *traceid_list;
> -
Reviewed-by: Mathieu Poirier <mathieu.poir...@linaro.org>
> struct cs_etm_queue;
>
> struct cs_etm_packet {
> --
> 2.17.1
>
