aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-04-21 22:41:35 -0400
committerSteven Rostedt <rostedt@goodmis.org>2011-04-29 22:52:55 -0400
commit8ab2b7efd3e2ccf2c2dda3206b8171ecdbd0af40 (patch)
tree69b3bbcdbbe7deecf3910ee28ee62e07c004a2ea /kernel/trace
parent0778d9ad33898faab7bf6316108b471790376e35 (diff)
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,
2707{ 2707{
2708 unsigned long *p; 2708 unsigned long *p;
2709 unsigned long addr; 2709 unsigned long addr;
2710 unsigned long flags;
2711 2710
2712 mutex_lock(&ftrace_lock); 2711 mutex_lock(&ftrace_lock);
2713 p = start; 2712 p = start;
@@ -2724,10 +2723,7 @@ static int ftrace_process_locs(struct module *mod,
2724 ftrace_record_ip(addr); 2723 ftrace_record_ip(addr);
2725 } 2724 }
2726 2725
2727 /* disable interrupts to prevent kstop machine */
2728 local_irq_save(flags);
2729 ftrace_update_code(mod); 2726 ftrace_update_code(mod);
2730 local_irq_restore(flags);
2731 mutex_unlock(&ftrace_lock); 2727 mutex_unlock(&ftrace_lock);
2732 2728
2733 return 0; 2729 return 0;