aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/trace/ftrace.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index a12aff849c04..e77a6c92620f 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2935,14 +2935,13 @@ static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs)
2935 p = &pg->records[i]; 2935 p = &pg->records[i];
2936 p->flags = rec_flags; 2936 p->flags = rec_flags;
2937 2937
2938#ifndef CC_USING_NOP_MCOUNT
2939 /* 2938 /*
2940 * Do the initial record conversion from mcount jump 2939 * Do the initial record conversion from mcount jump
2941 * to the NOP instructions. 2940 * to the NOP instructions.
2942 */ 2941 */
2943 if (!ftrace_code_disable(mod, p)) 2942 if (!__is_defined(CC_USING_NOP_MCOUNT) &&
2943 !ftrace_code_disable(mod, p))
2944 break; 2944 break;
2945#endif
2946 2945
2947 update_cnt++; 2946 update_cnt++;
2948 } 2947 }