diff --git a/debian/changelog b/debian/changelog
index 9d7724b09..3cff07b96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -388,6 +388,8 @@ linux (4.19.152-1) UNRELEASED; urgency=medium
   [ Salvatore Bonaccorso ]
   * [rt] Update to 4.19.148-rt64
   * Bump ABI to 12
+  * Revert "perf cs-etm: Move definition of 'traceid_list' global variable
+    from header file"
 
  -- Salvatore Bonaccorso <carnil@debian.org>  Sat, 26 Sep 2020 11:17:48 +0200
 
diff --git a/debian/patches/debian/Revert-perf-cs-etm-Move-definition-of-traceid_list-g.patch b/debian/patches/debian/Revert-perf-cs-etm-Move-definition-of-traceid_list-g.patch
new file mode 100644
index 000000000..67ca09e94
--- /dev/null
+++ b/debian/patches/debian/Revert-perf-cs-etm-Move-definition-of-traceid_list-g.patch
@@ -0,0 +1,46 @@
+From 14ee286ede5c2534a1c8b7ce465cf4b7df4cde7e Mon Sep 17 00:00:00 2001
+From: Salvatore Bonaccorso <carnil@debian.org>
+Date: Sat, 17 Oct 2020 11:42:06 +0200
+Subject: [PATCH] Revert "perf cs-etm: Move definition of 'traceid_list' global
+ variable from header file"
+
+This reverts commit b801d568c7d85f816f1afb6e869f069c3ebe8b66 from
+upstream in 4.19.152. It causes FTBFS for the perf tools.
+
+Link: https://lore.kernel.org/stable/CA+G9fYsZh9L_1RsH+LipyzOzEYFunSU=b_bZeuzMi6-SQxRMKw@mail.gmail.com/T/#md2f4aad2ebe0c0b7f8e318259127c72c3cfff5b0
+---
+ 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 ad33b99f5d21..7b5e15cc6b71 100644
+--- a/tools/perf/util/cs-etm.c
++++ b/tools/perf/util/cs-etm.c
+@@ -87,9 +87,6 @@ struct cs_etm_queue {
+ 	struct cs_etm_packet *packet;
+ };
+ 
+-/* 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_timeless_queues(struct cs_etm_auxtrace *etm,
+ 					   pid_t tid, u64 time_);
+diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h
+index c7ef97b198c7..37f8d48179ca 100644
+--- a/tools/perf/util/cs-etm.h
++++ b/tools/perf/util/cs-etm.h
+@@ -53,6 +53,9 @@ enum {
+ 	CS_ETMV4_PRIV_MAX,
+ };
+ 
++/* RB tree for quick conversion between traceID and CPUs */
++struct intlist *traceid_list;
++
+ #define KiB(x) ((x) * 1024)
+ #define MiB(x) ((x) * 1024 * 1024)
+ 
+-- 
+2.28.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 99578b307..399538ed1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -298,4 +298,6 @@ features/arm/staging-vc04_services-Use-correct-cache-line-size.patch
 debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
 debian/ntfs-mark-it-as-broken.patch
 
+debian/Revert-perf-cs-etm-Move-definition-of-traceid_list-g.patch
+
 # ABI maintenance