1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index eadd0eaea9b6..11d94f2dc485 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -307,7 +307,7 @@ void ftrace_release(void *start, unsigned long size)
         unsigned long e = s + size;
         int i;
 
-        if (!start)
+        if (ftrace_disabled || !start)
                 return;
 
         /* No interrupt should call this */
@@ -1567,7 +1567,7 @@ static int ftrace_convert_nops(unsigned long *start,
 
 void ftrace_init_module(unsigned long *start, unsigned long *end)
 {
-        if (start == end)
+        if (ftrace_disabled || start == end)
                 return;
         ftrace_convert_nops(start, end);
 }