From 9ab9ea2db0b13375d3d7114d5c82eb298a118740 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 4 Aug 2020 17:00:01 -0500 Subject: Linux v5.8 rebase Signed-off-by: Justin M. Forbes --- 20200505_leo_yan_linaro_org.patch | 70 --------------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 20200505_leo_yan_linaro_org.patch (limited to '20200505_leo_yan_linaro_org.patch') diff --git a/20200505_leo_yan_linaro_org.patch b/20200505_leo_yan_linaro_org.patch deleted file mode 100644 index 9674efab9..000000000 --- a/20200505_leo_yan_linaro_org.patch +++ /dev/null @@ -1,70 +0,0 @@ -From MAILER-DAEMON Wed May 6 20:19:37 2020 -From: Leo Yan -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@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: -Cc: Leo Yan -Sender: "linux-arm-kernel" -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 -Signed-off-by: Leo Yan -Tested-by: Thomas Backlund -Tested-by: Mike Leach -Reviewed-by: Mike Leach -Reviewed-by: Mathieu Poirier ---- - 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 - -- cgit