diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-06-10 17:15:58 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-06-10 17:15:58 -0500 |
commit | 614b7d7d7b10d8e3f146bed311215f818be5accd (patch) | |
tree | ff92323ae8547b034624753824df4568b1079918 /20200505_leo_yan_linaro_org.patch | |
parent | f74d84eda2966af5c10fcae2ef90a940f96943a0 (diff) | |
download | kernel-614b7d7d7b10d8e3f146bed311215f818be5accd.tar.gz kernel-614b7d7d7b10d8e3f146bed311215f818be5accd.tar.xz kernel-614b7d7d7b10d8e3f146bed311215f818be5accd.zip |
Initial 5.7.2 rebase
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '20200505_leo_yan_linaro_org.patch')
-rw-r--r-- | 20200505_leo_yan_linaro_org.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/20200505_leo_yan_linaro_org.patch b/20200505_leo_yan_linaro_org.patch new file mode 100644 index 000000000..9674efab9 --- /dev/null +++ b/20200505_leo_yan_linaro_org.patch @@ -0,0 +1,70 @@ +From MAILER-DAEMON Wed May 6 20:19:37 2020 +From: Leo Yan <leo.yan@linaro.org> +To: Arnaldo Carvalho de Melo <acme@kernel.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, Suzuki K Poulose <suzuki.poulose@arm.com>, Mike Leach <mike.leach@linaro.org>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>, Tor Jeremiassen <tor@ti.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org +Subject: [PATCH] perf cs-etm: Move defined of traceid_list +Date: Tue, 05 May 2020 21:36:42 +0800 +Message-Id: <20200505133642.4756-1-leo.yan@linaro.org> +List-Id: <linux-arm-kernel.lists.infradead.org> +Cc: Leo Yan <leo.yan@linaro.org> +Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> +Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 7bit + +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> +Tested-by: Thomas Backlund <tmb@mageia.org> +Tested-by: Mike Leach <mike.leach@linaro.org> +Reviewed-by: Mike Leach <mike.leach@linaro.org> +Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.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 + |