mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 21:09:03 +02:00
linux-raspberrypi-5.4: backport a fix for perf build with -fno-common from gcc-10
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
968dcd3f40
commit
1991ef8283
|
@ -0,0 +1,68 @@
|
||||||
|
From 168200b6d6ea0cb5765943ec5da5b8149701f36a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Leo Yan <leo.yan@linaro.org>
|
||||||
|
Date: Tue, 5 May 2020 21:36:42 +0800
|
||||||
|
Subject: [PATCH] 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.
|
||||||
|
|
||||||
|
Upstream-Status: Backport [v5.8-rc1]
|
||||||
|
|
||||||
|
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 3c802fde4954..c283223fb31f 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.25.1
|
||||||
|
|
|
@ -7,5 +7,6 @@ require linux-raspberrypi_5.4.inc
|
||||||
|
|
||||||
SRC_URI += "file://0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch \
|
SRC_URI += "file://0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch \
|
||||||
file://0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch \
|
file://0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch \
|
||||||
|
file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \
|
||||||
file://powersave.cfg \
|
file://powersave.cfg \
|
||||||
"
|
"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user