From: Subject: Activate #ifdef FTRACE_MCOUNT_MAX_OFFSET only if defined as nonzero Revert b39181f7c6 (ftrace: Add FTRACE_MCOUNT_MAX_OFFSET to avoid adding weak function) for 32bit diff -up ./kernel/trace/ftrace.c.ft ./kernel/trace/ftrace.c --- ./kernel/trace/ftrace.c.ft 2026-02-01 08:09:53.000000000 +0900 +++ ./kernel/trace/ftrace.c 2026-05-28 20:22:49.220436686 +0900 @@ -4216,7 +4216,7 @@ static void add_trampoline_func(struct s seq_printf(m, " ->%pS", ptr); } -#ifdef FTRACE_MCOUNT_MAX_OFFSET +#if defined(FTRACE_MCOUNT_MAX_OFFSET) && (FTRACE_MCOUNT_MAX_OFFSET) /* * Weak functions can still have an mcount/fentry that is saved in * the __mcount_loc section. These can be detected by having a @@ -4302,7 +4302,7 @@ static int print_rec(struct seq_file *m, seq_printf(m, " [%s]", modname); return ret == NULL ? -1 : 0; } -#else +#else /* FTRACE_MCOUNT_MAX_OFFSET */ static inline int test_for_valid_rec(struct dyn_ftrace *rec) { return 1; @@ -4313,7 +4313,7 @@ static inline int print_rec(struct seq_f seq_printf(m, "%ps", (void *)ip); return 0; } -#endif +#endif /* FTRACE_MCOUNT_MAX_OFFSET */ static int t_show(struct seq_file *m, void *v) { @@ -4728,7 +4728,7 @@ add_rec_by_index(struct ftrace_hash *has return 0; } -#ifdef FTRACE_MCOUNT_MAX_OFFSET +#if defined(FTRACE_MCOUNT_MAX_OFFSET) && (FTRACE_MCOUNT_MAX_OFFSET) static int lookup_ip(unsigned long ip, char **modname, char *str) { unsigned long offset;