1 files changed, 1 insertions, 9 deletions

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 38277af44f5c..576c41644e77 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -34,7 +34,6 @@
 #include <linux/hash.h>
 #include <linux/rcupdate.h>
 #include <linux/kprobes.h>
-#include <linux/memory.h>
 
 #include <trace/events/sched.h>
 
@@ -2611,12 +2610,10 @@ static void ftrace_run_update_code(int command)
 {
         int ret;
 
-        mutex_lock(&text_mutex);
-
         ret = ftrace_arch_code_modify_prepare();
         FTRACE_WARN_ON(ret);
         if (ret)
-                goto out_unlock;
+                return;
 
         /*
          * By default we use stop_machine() to modify the code.
@@ -2628,9 +2625,6 @@ static void ftrace_run_update_code(int command)
 
         ret = ftrace_arch_code_modify_post_process();
         FTRACE_WARN_ON(ret);
-
-out_unlock:
-        mutex_unlock(&text_mutex);
 }
 
 static void ftrace_run_modify_code(struct ftrace_ops *ops, int command,
@@ -5784,7 +5778,6 @@ void ftrace_module_enable(struct module *mod)
         struct ftrace_page *pg;
 
         mutex_lock(&ftrace_lock);
-        mutex_lock(&text_mutex);
 
         if (ftrace_disabled)
                 goto out_unlock;
@@ -5846,7 +5839,6 @@ void ftrace_module_enable(struct module *mod)
                 ftrace_arch_code_modify_post_process();
 
  out_unlock:
-        mutex_unlock(&text_mutex);
         mutex_unlock(&ftrace_lock);
 
         process_cached_mods(mod->name);