1 files changed, 5 insertions, 4 deletions

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 26c45aaf6805..08f4a624e31f 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -532,11 +532,12 @@ static void ftrace_replace_code(int enable)
 
         do_for_each_ftrace_rec(pg, rec) {
                 /*
-                 * Skip over free records and records that have
-                 * failed.
+                 * Skip over free records, records that have
+                 * failed and not converted.
                  */
                 if (rec->flags & FTRACE_FL_FREE ||
-                    rec->flags & FTRACE_FL_FAILED)
+                    rec->flags & FTRACE_FL_FAILED ||
+                    rec->flags & FTRACE_FL_CONVERTED)
                         continue;
 
                 /* ignore updates to this record's mcount site */
@@ -548,7 +549,7 @@ static void ftrace_replace_code(int enable)
                 }
 
                 failed = __ftrace_replace_code(rec, enable);
-                if (failed && (rec->flags & FTRACE_FL_CONVERTED)) {
+                if (failed) {
                         rec->flags |= FTRACE_FL_FAILED;
                         if ((system_state == SYSTEM_BOOTING) ||
                             !core_kernel_text(rec->ip)) {