From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 11 Dec 2023 13:57:25 +0000 (+0100)
Subject: 4.19-stable patches
X-Git-Tag: v4.14.333~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e284ae7a7aeacda6ac4e9b6dca096d3e3858cad0;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	tools-headers-uapi-sync-linux-perf_event.h-with-the-kernel-sources.patch
---

diff --git a/queue-4.19/series b/queue-4.19/series
index 97edffaab3d..1a0dd89905e 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -50,3 +50,4 @@ netlink-don-t-call-netlink_bind-with-table-lock-held.patch
 genetlink-add-cap_net_admin-test-for-multicast-bind.patch
 psample-require-cap_net_admin-when-joining-packets-group.patch
 drop_monitor-require-cap_sys_admin-when-joining-events-group.patch
+tools-headers-uapi-sync-linux-perf_event.h-with-the-kernel-sources.patch
diff --git a/queue-4.19/tools-headers-uapi-sync-linux-perf_event.h-with-the-kernel-sources.patch b/queue-4.19/tools-headers-uapi-sync-linux-perf_event.h-with-the-kernel-sources.patch
new file mode 100644
index 00000000000..0e72e323b5e
--- /dev/null
+++ b/queue-4.19/tools-headers-uapi-sync-linux-perf_event.h-with-the-kernel-sources.patch
@@ -0,0 +1,54 @@
+From 65ba872a6971c11ceb342c3330f059289c0e6bdb Mon Sep 17 00:00:00 2001
+From: Namhyung Kim <namhyung@kernel.org>
+Date: Thu, 18 Aug 2022 17:36:41 -0700
+Subject: tools headers UAPI: Sync linux/perf_event.h with the kernel sources
+
+From: Namhyung Kim <namhyung@kernel.org>
+
+commit 65ba872a6971c11ceb342c3330f059289c0e6bdb upstream.
+
+To pick the trivial change in:
+
+  119a784c81270eb8 ("perf/core: Add a new read format to get a number of lost samples")
+
+Signed-off-by: Namhyung Kim <namhyung@kernel.org>
+Acked-by: Jiri Olsa <jolsa@kernel.org>
+Cc: Ian Rogers <irogers@google.com>
+Cc: Ingo Molnar <mingo@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Link: https://lore.kernel.org/r/20220819003644.508916-2-namhyung@kernel.org
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/include/uapi/linux/perf_event.h |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/tools/include/uapi/linux/perf_event.h
++++ b/tools/include/uapi/linux/perf_event.h
+@@ -273,6 +273,7 @@ enum {
+  *	  { u64		time_enabled; } && PERF_FORMAT_TOTAL_TIME_ENABLED
+  *	  { u64		time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING
+  *	  { u64		id;           } && PERF_FORMAT_ID
++ *	  { u64		lost;         } && PERF_FORMAT_LOST
+  *	} && !PERF_FORMAT_GROUP
+  *
+  *	{ u64		nr;
+@@ -280,6 +281,7 @@ enum {
+  *	  { u64		time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING
+  *	  { u64		value;
+  *	    { u64	id;           } && PERF_FORMAT_ID
++ *	    { u64	lost;         } && PERF_FORMAT_LOST
+  *	  }		cntr[nr];
+  *	} && PERF_FORMAT_GROUP
+  * };
+@@ -289,8 +291,9 @@ enum perf_event_read_format {
+ 	PERF_FORMAT_TOTAL_TIME_RUNNING		= 1U << 1,
+ 	PERF_FORMAT_ID				= 1U << 2,
+ 	PERF_FORMAT_GROUP			= 1U << 3,
++	PERF_FORMAT_LOST			= 1U << 4,
+ 
+-	PERF_FORMAT_MAX = 1U << 4,		/* non-ABI */
++	PERF_FORMAT_MAX = 1U << 5,		/* non-ABI */
+ };
+ 
+ #define PERF_ATTR_SIZE_VER0	64	/* sizeof first published struct */