aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 91887a280ab9..380de630ebce 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1209,7 +1209,7 @@ void trace_graph_entry(struct ftrace_graph_ent *trace)
1209 int cpu; 1209 int cpu;
1210 int pc; 1210 int pc;
1211 1211
1212 raw_local_irq_save(flags); 1212 local_irq_save(flags);
1213 cpu = raw_smp_processor_id(); 1213 cpu = raw_smp_processor_id();
1214 data = tr->data[cpu]; 1214 data = tr->data[cpu];
1215 disabled = atomic_inc_return(&data->disabled); 1215 disabled = atomic_inc_return(&data->disabled);
@@ -1218,7 +1218,7 @@ void trace_graph_entry(struct ftrace_graph_ent *trace)
1218 __trace_graph_entry(tr, data, trace, flags, pc); 1218 __trace_graph_entry(tr, data, trace, flags, pc);
1219 } 1219 }
1220 atomic_dec(&data->disabled); 1220 atomic_dec(&data->disabled);
1221 raw_local_irq_restore(flags); 1221 local_irq_restore(flags);
1222} 1222}
1223 1223
1224void trace_graph_return(struct ftrace_graph_ret *trace) 1224void trace_graph_return(struct ftrace_graph_ret *trace)
@@ -1230,7 +1230,7 @@ void trace_graph_return(struct ftrace_graph_ret *trace)
1230 int cpu; 1230 int cpu;
1231 int pc; 1231 int pc;
1232 1232
1233 raw_local_irq_save(flags); 1233 local_irq_save(flags);
1234 cpu = raw_smp_processor_id(); 1234 cpu = raw_smp_processor_id();
1235 data = tr->data[cpu]; 1235 data = tr->data[cpu];
1236 disabled = atomic_inc_return(&data->disabled); 1236 disabled = atomic_inc_return(&data->disabled);
@@ -1239,7 +1239,7 @@ void trace_graph_return(struct ftrace_graph_ret *trace)
1239 __trace_graph_return(tr, data, trace, flags, pc); 1239 __trace_graph_return(tr, data, trace, flags, pc);
1240 } 1240 }
1241 atomic_dec(&data->disabled); 1241 atomic_dec(&data->disabled);
1242 raw_local_irq_restore(flags); 1242 local_irq_restore(flags);
1243} 1243}
1244#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ 1244#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
1245 1245
@@ -2645,7 +2645,7 @@ tracing_cpumask_write(struct file *filp, const char __user *ubuf,
2645 if (err) 2645 if (err)
2646 goto err_unlock; 2646 goto err_unlock;
2647 2647
2648 raw_local_irq_disable(); 2648 local_irq_disable();
2649 __raw_spin_lock(&ftrace_max_lock); 2649 __raw_spin_lock(&ftrace_max_lock);
2650 for_each_tracing_cpu(cpu) { 2650 for_each_tracing_cpu(cpu) {
2651 /* 2651 /*
@@ -2662,7 +2662,7 @@ tracing_cpumask_write(struct file *filp, const char __user *ubuf,
2662 } 2662 }
2663 } 2663 }
2664 __raw_spin_unlock(&ftrace_max_lock); 2664 __raw_spin_unlock(&ftrace_max_lock);
2665 raw_local_irq_enable(); 2665 local_irq_enable();
2666 2666
2667 tracing_cpumask = tracing_cpumask_new; 2667 tracing_cpumask = tracing_cpumask_new;
2668 2668