From: Greg Kroah-Hartman Date: Thu, 9 Jul 2026 14:23:46 +0000 (+0200) Subject: 6.12-stable patches X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccbb2a437e4b7ca3d079686e6272ed08c7c3ae1f;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch --- 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 index 0000000000..20e943b177 --- /dev/null +++ b/queue-6.12/perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch @@ -0,0 +1,60 @@ +From 7ee7f48413c42b90230de4a8e40898b757bc8e82 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli +Date: Wed, 13 May 2026 12:23:46 -0700 +Subject: perf trace beauty fcntl: Fix build with older kernel headers + +From: Florian Fainelli + +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 +Signed-off-by: Florian Fainelli +Cc: Adrian Hunter +Cc: Alexander Shishkin +Cc: Ingo Molnar +Cc: James Clark +Cc: Jiri Olsa +Cc: Mark Rutland +Cc: Markus Mayer +Cc: Namhyung Kim +Cc: Peter Zijlstra +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Greg Kroah-Hartman +--- + 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 + #include + ++#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") : diff --git a/queue-6.12/series b/queue-6.12/series index 81dc342160..1a7f9d48aa 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -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