Skip to content

Commit 168200b

Browse files
Leo Yanacmel
Leo Yan
authored andcommitted
perf cs-etm: Move definition of 'traceid_list' global variable from header file
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: cd8bfd8 ("perf tools: Add processing of coresight metadata") Reported-by: Thomas Backlund <[email protected]> Signed-off-by: Leo Yan <[email protected]> Reviewed-by: Mathieu Poirier <[email protected]> Reviewed-by: Mike Leach <[email protected]> Tested-by: Mike Leach <[email protected]> Tested-by: Thomas Backlund <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Suzuki Poulouse <[email protected]> Cc: Tor Jeremiassen <[email protected]> Cc: [email protected] Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 32add10 commit 168200b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tools/perf/util/cs-etm.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ struct cs_etm_queue {
9494
struct cs_etm_traceid_queue **traceid_queues;
9595
};
9696

97+
/* RB tree for quick conversion between traceID and metadata pointers */
98+
static struct intlist *traceid_list;
99+
97100
static int cs_etm__update_queues(struct cs_etm_auxtrace *etm);
98101
static int cs_etm__process_queues(struct cs_etm_auxtrace *etm);
99102
static int cs_etm__process_timeless_queues(struct cs_etm_auxtrace *etm,

tools/perf/util/cs-etm.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ enum cs_etm_isa {
114114
CS_ETM_ISA_T32,
115115
};
116116

117-
/* RB tree for quick conversion between traceID and metadata pointers */
118-
struct intlist *traceid_list;
119-
120117
struct cs_etm_queue;
121118

122119
struct cs_etm_packet {

0 commit comments

Comments
 (0)