From: Steven Rostedt <rostedt@goodmis.org>
Date: Tue, 4 Nov 2025 15:05:02 +0000 (-0500)
Subject: Merge branch 'topic/func-profiler-offset' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=2f294c35c0b9302dac2a741fa715822a10c265c3;p=linux%2F.git

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>
---

2f294c35c0b9302dac2a741fa715822a10c265c3
diff --cc kernel/trace/trace_syscalls.c
index 47d9771e8f7c,e2c679bd7ace..e07c5a3cc7ab
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@@ -262,15 -146,6 +262,15 @@@ print_syscall_enter(struct trace_iterat
  		goto end;
  	}
  
 +	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:
 +		break;
 +	}
 +
  	trace_seq_printf(s, "%s(", entry->name);
  
  	for (i = 0; i < entry->nb_args; i++) {