Skip to content

Commit edfeb4e

Browse files
tracing: Fix HAVE_DYNAMIC_FTRACE_WITH_REGS ifdef
JIRA: https://issues.redhat.com/browse/RHEL-101598 commit bdbddb1 Author: Petr Pavlu <petr.pavlu@suse.com> Date: Tue Feb 13 14:24:34 2024 +0100 tracing: Fix HAVE_DYNAMIC_FTRACE_WITH_REGS ifdef Commit a8b9cf6 ("ftrace: Fix DIRECT_CALLS to use SAVE_REGS by default") attempted to fix an issue with direct trampolines on x86, see its description for details. However, it wrongly referenced the HAVE_DYNAMIC_FTRACE_WITH_REGS config option and the problem is still present. Add the missing "CONFIG_" prefix for the logic to work as intended. Link: https://lore.kernel.org/linux-trace-kernel/20240213132434.22537-1-petr.pavlu@suse.com Fixes: a8b9cf6 ("ftrace: Fix DIRECT_CALLS to use SAVE_REGS by default") Signed-off-by: Petr Pavlu <petr.pavlu@suse.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
1 parent 33154c2 commit edfeb4e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/trace/ftrace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5281,7 +5281,7 @@ static int register_ftrace_function_nolock(struct ftrace_ops *ops);
52815281
* not support ftrace_regs_caller but direct_call, use SAVE_ARGS so that it
52825282
* jumps from ftrace_caller for multiple ftrace_ops.
52835283
*/
5284-
#ifndef HAVE_DYNAMIC_FTRACE_WITH_REGS
5284+
#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS
52855285
#define MULTI_FLAGS (FTRACE_OPS_FL_DIRECT | FTRACE_OPS_FL_SAVE_ARGS)
52865286
#else
52875287
#define MULTI_FLAGS (FTRACE_OPS_FL_DIRECT | FTRACE_OPS_FL_SAVE_REGS)

0 commit comments

Comments
 (0)