summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-04-22 04:41:35 +0200
committerSteven Rostedt <rostedt@goodmis.org>2011-04-30 04:52:55 +0200
commit8ab2b7efd3e2ccf2c2dda3206b8171ecdbd0af40 (patch)
tree69b3bbcdbbe7deecf3910ee28ee62e07c004a2ea /kernel/trace
parentftrace: Make FTRACE_WARN_ON() work in if condition (diff)
downloadlinux-8ab2b7efd3e2ccf2c2dda3206b8171ecdbd0af40.tar.xz
linux-8ab2b7efd3e2ccf2c2dda3206b8171ecdbd0af40.zip
ftrace: Remove unnecessary disabling of irqs
The disabling of interrupts around ftrace_update_code() was used to protect against the evil ftrace daemon from years past. But that daemon has long been killed. It is safe to keep interrupts enabled while updating the initial mcount into nops. The ftrace_mutex is also held which keeps other users at bay. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/ftrace.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 4ff65599c973..f199fb2e1d2c 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2707,7 +2707,6 @@ static int ftrace_process_locs(struct module *mod,
{
unsigned long *p;
unsigned long addr;
- unsigned long flags;
mutex_lock(&ftrace_lock);
p = start;
@@ -2724,10 +2723,7 @@ static int ftrace_process_locs(struct module *mod,
ftrace_record_ip(addr);
}
- /* disable interrupts to prevent kstop machine */
- local_irq_save(flags);
ftrace_update_code(mod);
- local_irq_restore(flags);
mutex_unlock(&ftrace_lock);
return 0;