Skip to content

Commit

Permalink
BACKPORT: perf cs-etm: Move definition of 'traceid_list' global varia…
Browse files Browse the repository at this point in the history
…ble 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]>
(cherry picked from commit 168200b)

Conflicts:
	tools/perf/util/cs-etm.c
	tools/perf/util/cs-etm.h

Change-Id: I3c15e3cdbd3ca8082f6eab16ba9edd71e891772f
Signed-off-by: Jeffy Chen <[email protected]>
Signed-off-by: Caesar Wang <[email protected]>
  • Loading branch information
Leo Yan authored and Caesar-github committed Nov 10, 2022
1 parent a61aa39 commit 467fedf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 3 additions & 0 deletions tools/perf/util/cs-etm.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ struct cs_etm_queue {
bool kernel_mapped;
};

/* RB tree for quick conversion between traceID and metadata pointers */
static struct intlist *traceid_list;

static int cs_etm__get_trace(struct cs_etm_buffer *buff, struct cs_etm_queue *etmq);
static int cs_etm__update_queues(struct cs_etm_auxtrace *);
static int cs_etm__process_queues(struct cs_etm_auxtrace *, u64);
Expand Down
3 changes: 0 additions & 3 deletions tools/perf/util/cs-etm.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,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)

Expand Down

0 comments on commit 467fedf

Please sign in to comment.