summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-10-17 09:39:30 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-10-17 09:39:30 -0500
commit1670c9fa7652e09eacd13b774337c921509bf549 (patch)
tree5bb164d3d6e26494ef027e9cfc5a7f0a448a313a
parent29ba48b301e74204d1000d709cc0c48e3dba58a9 (diff)
downloadkernel-1670c9fa7652e09eacd13b774337c921509bf549.tar.gz
kernel-1670c9fa7652e09eacd13b774337c921509bf549.tar.xz
kernel-1670c9fa7652e09eacd13b774337c921509bf549.zip
Build fix for perf
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--patch-6.1-redhat.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index 4f296e91f..0d8d1194e 100644
--- a/patch-6.1-redhat.patch
+++ b/patch-6.1-redhat.patch
@@ -3008,3 +3008,57 @@ index 79d82cb6e469..843b0dd8f0dd 100644
#ifdef CONFIG_PERF_EVENTS
int security_perf_event_open(struct perf_event_attr *attr, int type)
{
+From 9c9d8f1b7327830376445c4dd05b121e1525c93f Mon Sep 17 00:00:00 2001
+From: Adrian Hunter <adrian.hunter@intel.com>
+Date: Mon, 17 Oct 2022 12:35:49 +0300
+Subject: [PATCH] perf tools: Fix man page build wrt perf-arm-coresight.txt
+
+perf build assumes documentation files starting with "perf-" are man
+pages but perf-arm-coresight.txt is not a man page:
+
+asciidoc: ERROR: perf-arm-coresight.txt: line 2: malformed manpage title
+asciidoc: ERROR: perf-arm-coresight.txt: line 3: name section expected
+asciidoc: FAILED: perf-arm-coresight.txt: line 3: section title expected
+make[3]: *** [Makefile:266: perf-arm-coresight.xml] Error 1
+make[3]: *** Waiting for unfinished jobs....
+make[2]: *** [Makefile.perf:895: man] Error 2
+
+Fix by renaming it.
+
+Reported-by: Sven Schnelle <svens@linux.ibm.com>
+Reported-by: Christian Borntraeger <borntraeger@linux.ibm.com>
+Fixes: dc2e0fb00bb2 ("perf test coresight: Add relevant documentation about ARM64 CoreSight testing")
+Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
+Reviewed-by: Leo Yan <leo.yan@linaro.org>
+---
+ tools/perf/Documentation/arm-coresight.txt | 5 +++++
+ tools/perf/Documentation/perf-arm-coresight.txt | 5 -----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+ create mode 100644 tools/perf/Documentation/arm-coresight.txt
+ delete mode 100644 tools/perf/Documentation/perf-arm-coresight.txt
+
+diff --git a/tools/perf/Documentation/arm-coresight.txt b/tools/perf/Documentation/arm-coresight.txt
+new file mode 100644
+index 000000000000..c117fc50a2a9
+--- /dev/null
++++ b/tools/perf/Documentation/arm-coresight.txt
+@@ -0,0 +1,5 @@
++Arm CoreSight Support
++=====================
++
++For full documentation, see Documentation/trace/coresight/coresight-perf.rst
++in the kernel tree.
+diff --git a/tools/perf/Documentation/perf-arm-coresight.txt b/tools/perf/Documentation/perf-arm-coresight.txt
+deleted file mode 100644
+index c117fc50a2a9..000000000000
+--- a/tools/perf/Documentation/perf-arm-coresight.txt
++++ /dev/null
+@@ -1,5 +0,0 @@
+-Arm CoreSight Support
+-=====================
+-
+-For full documentation, see Documentation/trace/coresight/coresight-perf.rst
+-in the kernel tree.
+--
+2.37.3
+