]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.12-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jul 2026 14:23:46 +0000 (16:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jul 2026 14:23:46 +0000 (16:23 +0200)
added patches:
perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch

queue-6.12/perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch [new file with mode: 0644]
queue-6.12/series

diff --git a/queue-6.12/perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch b/queue-6.12/perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch
new file mode 100644 (file)
index 0000000..20e943b
--- /dev/null
@@ -0,0 +1,60 @@
+From 7ee7f48413c42b90230de4a8e40898b757bc8e82 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian.fainelli@broadcom.com>
+Date: Wed, 13 May 2026 12:23:46 -0700
+Subject: perf trace beauty fcntl: Fix build with older kernel headers
+
+From: Florian Fainelli <florian.fainelli@broadcom.com>
+
+commit 7ee7f48413c42b90230de4a8e40898b757bc8e82 upstream.
+
+Toolchains with older kernel headers that do not include upstream commit
+c75b1d9421f80f41 ("fs: add fcntl() interface for setting/getting write
+life time hints") will now fail to build perf due to missing definitions
+for F_GET_RW_HINT/F_SET_RW_HINT/F_GET_FILE_RW_HINT/F_SET_FILE_RW_HINT.
+
+Provide a fallback definition for these when they are not already
+defined.
+
+Fixes: 9c47f66748381ecb ("perf trace beauty fcntl: Basic 'arg' beautifier")
+Reviewed-by: Ian Rogers <irogers@google.com>
+Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Ingo Molnar <mingo@redhat.com>
+Cc: James Clark <james.clark@linaro.org>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: Mark Rutland <mark.rutland@arm.com>
+Cc: Markus Mayer <mmayer@broadcom.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/perf/trace/beauty/fcntl.c |   16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+--- a/tools/perf/trace/beauty/fcntl.c
++++ b/tools/perf/trace/beauty/fcntl.c
+@@ -9,6 +9,22 @@
+ #include <linux/kernel.h>
+ #include <linux/fcntl.h>
++#ifndef F_GET_RW_HINT
++#define F_GET_RW_HINT         (F_LINUX_SPECIFIC_BASE + 11)
++#endif
++
++#ifndef F_SET_RW_HINT
++#define F_SET_RW_HINT         (F_LINUX_SPECIFIC_BASE + 12)
++#endif
++
++#ifndef F_GET_FILE_RW_HINT
++#define F_GET_FILE_RW_HINT    (F_LINUX_SPECIFIC_BASE + 13)
++#endif
++
++#ifndef F_SET_FILE_RW_HINT
++#define F_SET_FILE_RW_HINT    (F_LINUX_SPECIFIC_BASE + 14)
++#endif
++
+ static size_t fcntl__scnprintf_getfd(unsigned long val, char *bf, size_t size, bool show_prefix)
+ {
+       return val ? scnprintf(bf, size, "%s", "0") :
index 81dc342160bd4a2a9fa3f00af37d5b7c52316dbd..1a7f9d48aa0ca1291bdc3aa41867503fb323eed3 100644 (file)
@@ -30,3 +30,4 @@ bonding-fix-xfrm-offload-feature-setup-on-active-bac.patch
 block-add-a-store_limit-operations-for-sysfs-entries.patch
 block-fix-queue-freeze-vs-limits-lock-order-in-sysfs.patch
 mm-khugepaged-write-all-dirty-file-folios-when-colla.patch
+perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch