Thanks Paul, This is now merged.
Bruce In message: [PATCH v5.10-rt] trace_events_trigger: fixup for v5.10.113 backport on -rt on 06/05/2022 Paul Gortmaker wrote: > The v5.10.113 brought a backport of commit ce33c845b030 "tracing: > Dump stacktrace trigger to the corresponding instance" and in that > backport it was switched from the three arg instance of __trace_stack() > to the 4 arg instance which was necessary for the older v5.10 baseline. > > However the v5.10-rt has a pre-mainline snapshot of the trace reduction > args; commit 36590c50b2d0729952511129916beeea30d31d81 "tracing: Merge > irqflags + preempt counter." -- so it in fact needs the non-converted > mainline backport. So switch back to the 3 arg instance to solve: > > kernel/trace/trace_events_trigger.c:1227:17: error: too many arguments > to function '__trace_stack' > > Signed-off-by: Paul Gortmaker <[email protected]> > > diff --git a/kernel/trace/trace_events_trigger.c > b/kernel/trace/trace_events_trigger.c > index 4bc90965abb2..6e2e41f73d40 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, tracing_gen_ctx(), STACK_SKIP); > } else > trace_dump_stack(STACK_SKIP); > } > -- > 2.33.0 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11284): https://lists.yoctoproject.org/g/linux-yocto/message/11284 Mute This Topic: https://lists.yoctoproject.org/mt/90939210/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
