From: <gregkh@linuxfoundation•org>
To: acme@redhat•com, alexander.shishkin@linux•intel.com,
gregkh@linuxfoundation•org, jolsa@redhat•com, leo.yan@linaro•org,
linux-arm-kernel@lists•infradead.org, mark.rutland@arm•com,
mathieu.poirier@linaro•org, mike.leach@linaro•org,
namhyung@kernel•org, pbarker@konsulko•com, peterz@infradead•org,
suzuki.poulose@arm•com, tmb@mageia•org, tor@ti•com
Cc: stable-commits@vger•kernel.org
Subject: Patch "perf cs-etm: Move definition of 'traceid_list' global variable from header file" has been added to the 5.4-stable tree
Date: Wed, 14 Oct 2020 15:57:43 +0200 [thread overview]
Message-ID: <160268386318675@kroah.com> (raw)
This is a note to let you know that I've just added the patch titled
perf cs-etm: Move definition of 'traceid_list' global variable from header file
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger•kernel.org> know about it.
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: perf cs-etm: Move definition of 'traceid_list' global variable from header file
From: Leo Yan <leo.yan@linaro•org>
commit 168200b6d6ea0cb5765943ec5da5b8149701f36a upstream.
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>
Cc: Paul Barker <pbarker@konsulko•com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
---
tools/perf/util/cs-etm.c | 3 +++
tools/perf/util/cs-etm.h | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
--- 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,
--- 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 {
Patches currently in stable-queue which might be from leo.yan@linaro•org are
queue-5.4/perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
reply other threads:[~2020-10-14 13:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160268386318675@kroah.com \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=acme@redhat$(echo .)com \
--cc=alexander.shishkin@linux$(echo .)intel.com \
--cc=jolsa@redhat$(echo .)com \
--cc=leo.yan@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=mark.rutland@arm$(echo .)com \
--cc=mathieu.poirier@linaro$(echo .)org \
--cc=mike.leach@linaro$(echo .)org \
--cc=namhyung@kernel$(echo .)org \
--cc=pbarker@konsulko$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=stable-commits@vger$(echo .)kernel.org \
--cc=suzuki.poulose@arm$(echo .)com \
--cc=tmb@mageia$(echo .)org \
--cc=tor@ti$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox