Commit cbdaeaf0 authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Steven Rostedt (VMware)

tracing: avoid build warning with HAVE_NOP_MCOUNT

Selecting HAVE_NOP_MCOUNT enables -mnop-mcount (if gcc supports it)
and sets CC_USING_NOP_MCOUNT. Reuse __is_defined (which is suitable for
testing CC_USING_* defines) to avoid conditional compilation and fix
the following gcc 9 warning on s390:

kernel/trace/ftrace.c:2514:1: warning: ‘ftrace_code_disable’ defined
but not used [-Wunused-function]


Fixes: 2f4df001 ("tracing: Add -mcount-nop option support")
Signed-off-by: default avatarVasily Gorbik <>
Signed-off-by: default avatarSteven Rostedt (VMware) <>
parent becf33f6
......@@ -2935,14 +2935,13 @@ static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs)
p = &pg->records[i];
p->flags = rec_flags;
* Do the initial record conversion from mcount jump
* to the NOP instructions.
if (!ftrace_code_disable(mod, p))
if (!__is_defined(CC_USING_NOP_MCOUNT) &&
!ftrace_code_disable(mod, p))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment