When reviewing Linyu Yuan patches[1] where the change was to move most the macros from perf and bpf into stages, I realized that the macros that makes up perf and bpf events are duplicated from the tracefs macros that were moved into the stages directory. One reason to move them into that directory was to remove duplicate code. Remove the macros that are duplicated in the bpf and perf code and use stage 6, which is the macros used to build the data needed to record the TRACE_EVENT() TP_fast_assign() into the trace. This will mean they will pick up bug fixes, as well as any enhacements that are added. [1] https://lore.kernel.org/lkml/1671181385-5719-1-git-send-email-quic_linyyuan@xxxxxxxxxxx/ Steven Rostedt (Google) (2): perf/tracing: Use stage6 of tracing to not duplicate macros bpf/tracing: Use stage6 of tracing to not duplicate macros ---- include/trace/bpf_probe.h | 45 +-------------------------- include/trace/perf.h | 46 +--------------------------- include/trace/stages/stage6_event_callback.h | 3 ++ 3 files changed, 5 insertions(+), 89 deletions(-)