5.10-stable patches

added patches:
	tracing-have-filter-accept-common_cpu-to-be-consistent.patch

diff --git a/queue-5.10/series b/queue-5.10/series
index ebba6b5f815bfa35aae026d15fd73c60a314fcfd..79a4112d8e4a9fbb506427a6ffd59faea68c2942 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -7,3 +7,4 @@ mmc-pxamci-fix-another-error-handling-path-in-pxamci_probe.patch
 mmc-pxamci-fix-an-error-handling-path-in-pxamci_probe.patch
 mmc-meson-gx-fix-an-error-handling-path-in-meson_mmc_probe.patch
 btrfs-fix-lost-error-handling-when-looking-up-extended-ref-on-log-replay.patch
+tracing-have-filter-accept-common_cpu-to-be-consistent.patch

diff --git a/queue-5.10/tracing-have-filter-accept-common_cpu-to-be-consistent.patch b/queue-5.10/tracing-have-filter-accept-common_cpu-to-be-consistent.patch
new file mode 100644 (file)
index 0000000..c9feabc
--- /dev/null
+++ b/queue-5.10/tracing-have-filter-accept-common_cpu-to-be-consistent.patch
@@ -0,0 +1,40 @@
+From b2380577d4fe1c0ef3fa50417f1e441c016e4cbe Mon Sep 17 00:00:00 2001
+From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
+Date: Sat, 20 Aug 2022 09:43:22 -0400
+Subject: tracing: Have filter accept "common_cpu" to be consistent
+
+From: Steven Rostedt (Google) <rostedt@goodmis.org>
+
+commit b2380577d4fe1c0ef3fa50417f1e441c016e4cbe upstream.
+
+Make filtering consistent with histograms. As "cpu" can be a field of an
+event, allow for "common_cpu" to keep it from being confused with the
+"cpu" field of the event.
+
+Link: https://lkml.kernel.org/r/20220820134401.513062765@goodmis.org
+Link: https://lore.kernel.org/all/20220820220920.e42fa32b70505b1904f0a0ad@kernel.org/
+
+Cc: stable@vger.kernel.org
+Cc: Ingo Molnar <mingo@kernel.org>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Tzvetomir Stoyanov <tz.stoyanov@gmail.com>
+Cc: Tom Zanussi <zanussi@kernel.org>
+Fixes: 1e3bac71c5053 ("tracing/histogram: Rename "cpu" to "common_cpu"")
+Suggested-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
+Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/trace/trace_events.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/kernel/trace/trace_events.c
++++ b/kernel/trace/trace_events.c
+@@ -168,6 +168,7 @@ static int trace_define_generic_fields(v
+ 
+       __generic_field(int, CPU, FILTER_CPU);
+       __generic_field(int, cpu, FILTER_CPU);
++      __generic_field(int, common_cpu, FILTER_CPU);
+       __generic_field(char *, COMM, FILTER_COMM);
+       __generic_field(char *, comm, FILTER_COMM);
+