diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 10:06:00 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 10:06:00 +0000 |
commit | b15a952c52a6825376d3e7f6c1bf5c886c6d8b74 (patch) | |
tree | 1500f2f8f276908a36d8126cb632c0d6b1276764 /debian/patches-rt/0313-rt-remove-extra-parameter-from-__trace_stack.patch | |
parent | Adding upstream version 5.10.209. (diff) | |
download | linux-debian.tar.xz linux-debian.zip |
Adding debian version 5.10.209-2.debian/5.10.209-2debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | debian/patches-rt/0313-rt-remove-extra-parameter-from-__trace_stack.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/debian/patches-rt/0313-rt-remove-extra-parameter-from-__trace_stack.patch b/debian/patches-rt/0313-rt-remove-extra-parameter-from-__trace_stack.patch new file mode 100644 index 000000000..d688d1f6d --- /dev/null +++ b/debian/patches-rt/0313-rt-remove-extra-parameter-from-__trace_stack.patch @@ -0,0 +1,41 @@ +From 38a85604759ae488654bab5c1cd9f23cd0d77ce0 Mon Sep 17 00:00:00 2001 +From: "Luis Claudio R. Goncalves" <lgoncalv@redhat.com> +Date: Thu, 12 May 2022 23:25:33 -0300 +Subject: [PATCH 313/323] rt: remove extra parameter from __trace_stack() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz + +Fix the build error below while keeping the current PREEMPT_RT code: + +kernel/trace/trace_events_trigger.c: In function ‘stacktrace_trigger’: +kernel/trace/trace_events_trigger.c:1227:3: error: too many arguments to function ‘__trace_stack’ + __trace_stack(file->tr, flags, STACK_SKIP, preempt_count()); + ^~~~~~~~~~~~~ +In file included from kernel/trace/trace_events_trigger.c:15: +kernel/trace/trace.h:826:6: note: declared here + void __trace_stack(struct trace_array *tr, unsigned int trace_ctx, int skip); + ^~~~~~~~~~~~~ + +Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com> +--- + kernel/trace/trace_events_trigger.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c +index 4bc90965abb2..75fef9fcfd0f 100644 +--- a/kernel/trace/trace_events_trigger.c ++++ b/kernel/trace/trace_events_trigger.c +@@ -1224,7 +1224,7 @@ stacktrace_trigger(struct event_trigger_data *data, void *rec, + + if (file) { + local_save_flags(flags); +- __trace_stack(file->tr, flags, STACK_SKIP, preempt_count()); ++ __trace_stack(file->tr, STACK_SKIP, preempt_count()); + } else + trace_dump_stack(STACK_SKIP); + } +-- +2.43.0 + |