mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-02 15:37:49 +00:00
linux (RPi): update to 5.9-rc3-15e21e3
Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
parent
cf4721ac29
commit
f9e39ebd9a
@ -16,8 +16,8 @@ PKG_PATCH_DIRS="$LINUX"
|
|||||||
|
|
||||||
case "$LINUX" in
|
case "$LINUX" in
|
||||||
raspberrypi)
|
raspberrypi)
|
||||||
PKG_VERSION="2ce8c3ab0f9d1ffb67310ffd200be82d80a8d13d" # 5.4.61
|
PKG_VERSION="15e21e3c0a511e76bb4ed81898b6027fceaa46c5" # 5.9-rc3
|
||||||
PKG_SHA256="4e008bdb25d8d49223a1cd01cd5d5d882f511a7c6635a14f0a5100dd4a5e25ea"
|
PKG_SHA256="2285e280557d76f3740e267ac021fa31d01a18c2d578777e981201bde7867a76"
|
||||||
PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz"
|
PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz"
|
||||||
PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
|
PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
|
||||||
;;
|
;;
|
||||||
|
@ -1,66 +0,0 @@
|
|||||||
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.
|
|
||||||
|
|
||||||
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.27.0
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user