From 2ff6cc98d510029d5968fee6c5d860f3edec1958 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Wed, 18 Aug 2021 18:39:51 +0000
Subject: [PATCH] import systemtap-4.5-3.el8

---
 SOURCES/rhbz1991631.patch | 29 +++++++++++++++++++++++++++++
 SPECS/systemtap.spec      |  8 +++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/rhbz1991631.patch

diff --git a/SOURCES/rhbz1991631.patch b/SOURCES/rhbz1991631.patch
new file mode 100644
index 0000000..9598ac8
--- /dev/null
+++ b/SOURCES/rhbz1991631.patch
@@ -0,0 +1,29 @@
+commit 515a6a2d63cdf16c5bc599f0d29283289219d9a4
+Author: Frank Ch. Eigler <fche@redhat.com>
+Date:   Thu Jun 24 13:30:38 2021 -0400
+
+    rhbz1972828: tapsets: iommu tracepoints
+    
+    Disable detection of intel-iommu tracepoint family on non-x86
+    platforms, because the 5.13ish kernel headers for this tracepoint
+    include references to functions like clcache_flush_range which don't
+    exist on all non-x86.
+
+diff --git a/tapsets.cxx b/tapsets.cxx
+index a5e41129f..20e0cb68f 100644
+--- a/tapsets.cxx
++++ b/tapsets.cxx
+@@ -11930,6 +11930,13 @@ static vector<string> tracepoint_extra_decls (systemtap_session& s,
+ 	they_live.push_back ("#include <linux/phy.h>");
+     }
+ 
++  if (header.find("intel_iommu") != string::npos && s.architecture != "x86_64" && s.architecture != "i386")
++    {
++      // need asm/cacheflush.h for clflush_cache_range() used in that header,
++      // but this function does not exist on e.g. ppc
++      they_live.push_back ("#error nope");
++    }
++
+   if (header.find("wbt") != string::npos)
+     {
+       // blk-wbt.h gets included as "../../../block/blk-wbt.h", so we
diff --git a/SPECS/systemtap.spec b/SPECS/systemtap.spec
index 61d99a8..548c5c2 100644
--- a/SPECS/systemtap.spec
+++ b/SPECS/systemtap.spec
@@ -90,7 +90,7 @@
 
 Name: systemtap
 Version: 4.5
-Release: 2%{?release_override}%{?dist}
+Release: 3%{?release_override}%{?dist}
 # for version, see also configure.ac
 
 
@@ -126,6 +126,8 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
 
+Patch1: rhbz1991631.patch
+
 # Build*
 BuildRequires: make
 BuildRequires: gcc-c++
@@ -536,6 +538,7 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 
@@ -1210,6 +1213,9 @@ exit 0
 
 # PRERELEASE
 %changelog
+* Thu Aug 12 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-3
+- rhbz1991631 iommu tracepoints break ppc64le
+
 * Tue Jul 27 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-2
 - rhbz1986543 rebuild against dyninst 11