diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2025-11-04 10:05:02 -0500 |
|---|---|---|
| committer | Steven Rostedt (Google) <rostedt@goodmis.org> | 2025-11-04 10:12:32 -0500 |
| commit | 2f294c35c0b9302dac2a741fa715822a10c265c3 (patch) | |
| tree | 7ec6122fed4cd687e14dfabb970277e8ec7c6fcd /kernel/trace/trace_syscalls.c | |
| parent | 25bd47a592751eba6ed337e6293dc69f8aa2452f (diff) | |
| parent | 1149fcf75972f6918aeb05303b1aa1e38e0df6eb (diff) | |
Merge branch 'topic/func-profiler-offset' of git://git.kernel.org/pub/scm/linux/kernel/git/mhiramat/linux into trace/trace/core
Updates to the function profiler adds new options to tracefs. The options
are currently defined by an enum as flags. The added options brings the
number of options over 32, which means they can no longer be held in a 32
bit enum. The TRACE_ITER_* flags are converted to a macro TRACE_ITER(*) to
allow the creation of options to still be done by macros.
This change is intrusive, as it affects all TRACE_ITER* options throughout
the trace code. Merge the branch that added these options and converted
the TRACE_ITER_* enum into a TRACE_ITER(*) macro, to allow the topic
branches to still be developed without conflict.
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace_syscalls.c')
| -rw-r--r-- | kernel/trace/trace_syscalls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 47d9771e8f7c..e07c5a3cc7ab 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -264,7 +264,7 @@ print_syscall_enter(struct trace_iterator *iter, int flags, switch (entry->syscall_nr) { case __NR_openat: - if (!tr || !(tr->trace_flags & TRACE_ITER_VERBOSE)) + if (!tr || !(tr->trace_flags & TRACE_ITER(VERBOSE))) return sys_enter_openat_print(trace, entry, s, event); break; default: @@ -284,7 +284,7 @@ print_syscall_enter(struct trace_iterator *iter, int flags, trace_seq_puts(s, ", "); /* parameter types */ - if (tr && tr->trace_flags & TRACE_ITER_VERBOSE) + if (tr && tr->trace_flags & TRACE_ITER(VERBOSE)) trace_seq_printf(s, "%s ", entry->types[i]); /* parameter values */ |