All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] perf cs-etm: Move defined of traceid_list
@ 2020-05-05 13:36 ` Leo Yan
  0 siblings, 0 replies; 7+ messages in thread
From: Leo Yan @ 2020-05-05 13:36 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo, Mathieu Poirier, Suzuki K Poulose,
	Mike Leach, Peter Zijlstra, Ingo Molnar, Mark Rutland,
	Alexander Shishkin, Jiri Olsa, Namhyung Kim, Tor Jeremiassen,
	linux-arm-kernel, linux-kernel
  Cc: Leo Yan

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 <tmb@mageia.org>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Reviewed-by: Mike Leach <mike.leach@linaro.org>
Tested-by: Mike Leach <mike.leach@linaro.org>
Tested-by: Thomas Backlund <tmb@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;
-
 struct cs_etm_queue;
 
 struct cs_etm_packet {
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH] perf cs-etm: Move defined of traceid_list
@ 2020-05-05 13:36 ` Leo Yan
  0 siblings, 0 replies; 7+ messages in thread
From: Leo Yan @ 2020-05-05 13:36 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo, Mathieu Poirier, Suzuki K Poulose,
	Mike Leach, Peter Zijlstra, Ingo Molnar, Mark Rutland,
	Alexander Shishkin, Jiri Olsa, Namhyung Kim, Tor Jeremiassen,
	linux-arm-kernel, linux-kernel
  Cc: Leo Yan

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 <tmb@mageia.org>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Reviewed-by: Mike Leach <mike.leach@linaro.org>
Tested-by: Mike Leach <mike.leach@linaro.org>
Tested-by: Thomas Backlund <tmb@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;
-
 struct cs_etm_queue;
 
 struct cs_etm_packet {
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH] perf cs-etm: Move defined of traceid_list
  2020-05-05 13:36 ` Leo Yan
@ 2020-05-05 14:52   ` Mathieu Poirier
  -1 siblings, 0 replies; 7+ messages in thread
From: Mathieu Poirier @ 2020-05-05 14:52 UTC (permalink / raw)
  To: Leo Yan
  Cc: Mark Rutland, Suzuki K Poulose, Peter Zijlstra,
	Linux Kernel Mailing List, Arnaldo Carvalho de Melo,
	Tor Jeremiassen, Alexander Shishkin, Ingo Molnar, Namhyung Kim,
	Jiri Olsa, linux-arm-kernel, Mike Leach

On Tue, 5 May 2020 at 07:37, Leo Yan <leo.yan@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 <tmb@mageia.org>
> Signed-off-by: Leo Yan <leo.yan@linaro.org>
> Reviewed-by: Mike Leach <mike.leach@linaro.org>
> Tested-by: Mike Leach <mike.leach@linaro.org>
> Tested-by: Thomas Backlund <tmb@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.poirier@linaro.org>

>  struct cs_etm_queue;
>
>  struct cs_etm_packet {
> --
> 2.17.1
>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] perf cs-etm: Move defined of traceid_list
@ 2020-05-05 14:52   ` Mathieu Poirier
  0 siblings, 0 replies; 7+ messages in thread
From: Mathieu Poirier @ 2020-05-05 14:52 UTC (permalink / raw)
  To: Leo Yan
  Cc: Arnaldo Carvalho de Melo, Suzuki K Poulose, Mike Leach,
	Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
	Jiri Olsa, Namhyung Kim, Tor Jeremiassen, linux-arm-kernel,
	Linux Kernel Mailing List

On Tue, 5 May 2020 at 07:37, Leo Yan <leo.yan@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 <tmb@mageia.org>
> Signed-off-by: Leo Yan <leo.yan@linaro.org>
> Reviewed-by: Mike Leach <mike.leach@linaro.org>
> Tested-by: Mike Leach <mike.leach@linaro.org>
> Tested-by: Thomas Backlund <tmb@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.poirier@linaro.org>

>  struct cs_etm_queue;
>
>  struct cs_etm_packet {
> --
> 2.17.1
>

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] perf cs-etm: Move defined of traceid_list
  2020-05-05 14:52   ` Mathieu Poirier
@ 2020-05-05 16:16     ` Arnaldo Carvalho de Melo
  -1 siblings, 0 replies; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-05-05 16:16 UTC (permalink / raw)
  To: Mathieu Poirier
  Cc: Mark Rutland, Suzuki K Poulose, Peter Zijlstra,
	Linux Kernel Mailing List, Tor Jeremiassen, Alexander Shishkin,
	Ingo Molnar, Leo Yan, Namhyung Kim, Jiri Olsa, linux-arm-kernel,
	Mike Leach

Em Tue, May 05, 2020 at 08:52:18AM -0600, Mathieu Poirier escreveu:
> On Tue, 5 May 2020 at 07:37, Leo Yan <leo.yan@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 <tmb@mageia.org>
> > Signed-off-by: Leo Yan <leo.yan@linaro.org>
> > Reviewed-by: Mike Leach <mike.leach@linaro.org>
> > Tested-by: Mike Leach <mike.leach@linaro.org>
> >  };
> >
> > -/* RB tree for quick conversion between traceID and metadata pointers */
> > -struct intlist *traceid_list;
> > -
> 
> Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> 


Thanks, applied,

- Arnaldo

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] perf cs-etm: Move defined of traceid_list
@ 2020-05-05 16:16     ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-05-05 16:16 UTC (permalink / raw)
  To: Mathieu Poirier
  Cc: Leo Yan, Suzuki K Poulose, Mike Leach, Peter Zijlstra,
	Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa,
	Namhyung Kim, Tor Jeremiassen, linux-arm-kernel,
	Linux Kernel Mailing List

Em Tue, May 05, 2020 at 08:52:18AM -0600, Mathieu Poirier escreveu:
> On Tue, 5 May 2020 at 07:37, Leo Yan <leo.yan@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 <tmb@mageia.org>
> > Signed-off-by: Leo Yan <leo.yan@linaro.org>
> > Reviewed-by: Mike Leach <mike.leach@linaro.org>
> > Tested-by: Mike Leach <mike.leach@linaro.org>
> >  };
> >
> > -/* RB tree for quick conversion between traceID and metadata pointers */
> > -struct intlist *traceid_list;
> > -
> 
> Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> 


Thanks, applied,

- Arnaldo

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [tip: perf/core] perf cs-etm: Move definition of 'traceid_list' global variable from header file
  2020-05-05 13:36 ` Leo Yan
  (?)
  (?)
@ 2020-05-08 13:04 ` tip-bot2 for Leo Yan
  -1 siblings, 0 replies; 7+ messages in thread
From: tip-bot2 for Leo Yan @ 2020-05-08 13:04 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Thomas Backlund, Leo Yan, Mathieu Poirier, Mike Leach,
	Alexander Shishkin, Jiri Olsa, Mark Rutland, Namhyung Kim,
	Peter Zijlstra, Suzuki Poulouse, Tor Jeremiassen,
	linux-arm-kernel, Arnaldo Carvalho de Melo, x86, LKML

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     168200b6d6ea0cb5765943ec5da5b8149701f36a
Gitweb:        https://git.kernel.org/tip/168200b6d6ea0cb5765943ec5da5b8149701f36a
Author:        Leo Yan <leo.yan@linaro.org>
AuthorDate:    Tue, 05 May 2020 21:36:42 +08:00
Committer:     Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Tue, 05 May 2020 16:35:32 -03:00

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: cd8bfd8c973e ("perf tools: Add processing of coresight metadata")
Reported-by: Thomas Backlund <tmb@mageia.org>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Mike Leach <mike.leach@linaro.org>
Tested-by: Mike Leach <mike.leach@linaro.org>
Tested-by: Thomas 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: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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 3c802fd..c283223 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 650ecc2..4ad925d 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;
-
 struct cs_etm_queue;
 
 struct cs_etm_packet {

^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-05-08 13:05 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-05 13:36 [PATCH] perf cs-etm: Move defined of traceid_list Leo Yan
2020-05-05 13:36 ` Leo Yan
2020-05-05 14:52 ` Mathieu Poirier
2020-05-05 14:52   ` Mathieu Poirier
2020-05-05 16:16   ` Arnaldo Carvalho de Melo
2020-05-05 16:16     ` Arnaldo Carvalho de Melo
2020-05-08 13:04 ` [tip: perf/core] perf cs-etm: Move definition of 'traceid_list' global variable from header file tip-bot2 for Leo Yan

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.