From: Greg Kroah-Hartman Date: Mon, 22 Aug 2022 07:44:32 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.9.326~74 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9be309fde5230bfae1308e2d1834d6df5b6796f6;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: tracing-have-filter-accept-common_cpu-to-be-consistent.patch --- diff --git a/queue-5.4/series b/queue-5.4/series index 8d4c169c2c6..b26a5c144f0 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -290,3 +290,4 @@ ata-libata-eh-add-missing-command-name.patch mmc-pxamci-fix-another-error-handling-path-in-pxamci_probe.patch mmc-pxamci-fix-an-error-handling-path-in-pxamci_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.4/tracing-have-filter-accept-common_cpu-to-be-consistent.patch b/queue-5.4/tracing-have-filter-accept-common_cpu-to-be-consistent.patch new file mode 100644 index 00000000000..bb61db8e8af --- /dev/null +++ b/queue-5.4/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)" +Date: Sat, 20 Aug 2022 09:43:22 -0400 +Subject: tracing: Have filter accept "common_cpu" to be consistent + +From: Steven Rostedt (Google) + +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 +Cc: Andrew Morton +Cc: Tzvetomir Stoyanov +Cc: Tom Zanussi +Fixes: 1e3bac71c5053 ("tracing/histogram: Rename "cpu" to "common_cpu"") +Suggested-by: Masami Hiramatsu (Google) +Acked-by: Masami Hiramatsu (Google) +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Greg Kroah-Hartman +--- + kernel/trace/trace_events.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/kernel/trace/trace_events.c ++++ b/kernel/trace/trace_events.c +@@ -166,6 +166,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); +