Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b801d568 authored by Leo Yan's avatar Leo Yan Committed by Greg Kroah-Hartman
Browse files

perf cs-etm: Move definition of 'traceid_list' global variable from header file 



commit 168200b6d6ea0cb5765943ec5da5b8149701f36a upstream.

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: cd8bfd8c ("perf tools: Add processing of coresight metadata")
Reported-by: default avatarThomas Backlund <tmb@mageia.org>
Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: default avatarMike Leach <mike.leach@linaro.org>
Tested-by: default avatarMike Leach <mike.leach@linaro.org>
Tested-by: default avatarThomas Backlund <tmb@mageia.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Tor Jeremiassen <tor@ti.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lore.kernel.org/lkml/20200505133642.4756-1-leo.yan@linaro.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Barker <pbarker@konsulko.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 47f65004

tools/perf/util/cs-etm.c

+3 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ struct cs_etm_queue { 
	struct cs_etm_packet *packet;

};



/* 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_timeless_queues(struct cs_etm_auxtrace *etm,

					   pid_t tid, u64 time_);

tools/perf/util/cs-etm.h

+0 −3
Original line number Diff line number Diff line
@@ -53,9 +53,6 @@ enum { 
	CS_ETMV4_PRIV_MAX,

};



/* RB tree for quick conversion between traceID and CPUs */

struct intlist *traceid_list;



#define KiB(x) ((x) * 1024)

#define MiB(x) ((x) * 1024 * 1024)