trace: Remove unused trace_array_cpu parameter
Subsystems (3)
PATCH 2/2 trace: Remove unused trace_array_cpu parameter
Impact: cleanup
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- block/blktrace.c | 2 +- kernel/trace/trace.c | 47 ++++++++++++++---------------------- kernel/trace/trace.h | 4 --- kernel/trace/trace_functions.c | 8 +++--- kernel/trace/trace_irqsoff.c | 10 ++++---- kernel/trace/trace_sched_switch.c | 4 +- kernel/trace/trace_sched_wakeup.c | 12 ++++----- 7 files changed, 35 insertions(+), 52 deletions(-)
block/blktrace.c +1 -1
@@ -245,7 +245,7 @@ record_it:if (pid !=0 && !(blk_tracer_flags.val &TRACE_BLK_OPT_CLASSIC ) && (trace_flags &TRACE_ITER_STACKTRACE ) !=0 ) -__trace_stack (blk_tr,NULL , flags,5 , pc); +__trace_stack (blk_tr, flags,5 , pc);trace_wake_up ();return ; }
kernel/trace/trace.c +18 -29
159 lines not on this page · raw message
kernel/trace/trace.h +0 -4
@@ -419,14 +419,12 @@ void ftrace(struct trace_array *tr,unsigned long parent_ip, unsigned long flags, int pc);void tracing_sched_switch_trace (struct trace_array *tr, -struct trace_array_cpu *data,struct task_struct *prev,struct task_struct *next,unsigned long flags,int pc);void tracing_record_cmdline (struct task_struct *tsk);void tracing_sched_wakeup_trace (struct trace_array *tr, -struct trace_array_cpu *data,struct task_struct *wakee,struct task_struct *cur,unsigned long flags,int pc);
@@ -436,7 +434,6 @@ void trace_special(struct trace_array *tr,unsigned long arg2, unsigned long arg3, int pc);void trace_function (struct trace_array *tr, -struct trace_array_cpu *data,unsigned long ip,unsigned long parent_ip,unsigned long flags,int pc);
@@ -462,7 +459,6 @@ void update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu);void __trace_stack (struct trace_array *tr, -struct trace_array_cpu *data,unsigned long flags,int skip,int pc);
kernel/trace/trace_functions.c +4 -4
@@ -78,7 +78,7 @@ function_trace_call_preempt_only(unsigned long ip, unsigned long parent_ip) disabled =atomic_inc_return (&data->disabled);if (likely (disabled ==1 )) -trace_function (tr, data, ip, parent_ip, flags, pc); +trace_function (tr, ip, parent_ip, flags, pc);atomic_dec (&data->disabled);ftrace_preempt_enable (resched);
@@ -108,7 +108,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)if (likely (disabled ==1 )) { pc =preempt_count (); -trace_function (tr, data, ip, parent_ip, flags, pc); +trace_function (tr, ip, parent_ip, flags, pc); }atomic_dec (&data->disabled);
@@ -139,7 +139,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip)if (likely (disabled ==1 )) { pc =preempt_count (); -trace_function (tr, data, ip, parent_ip, flags, pc); +trace_function (tr, ip, parent_ip, flags, pc);/* * skip over 5 funcs: * __ftrace_trace_stack,
@@ -148,7 +148,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip)* ftrace_list_func * ftrace_call */ -__trace_stack (tr, data, flags,5 , pc); +__trace_stack (tr, flags,5 , pc); }atomic_dec (&data->disabled);
kernel/trace/trace_irqsoff.c +5 -5
@@ -95,7 +95,7 @@ irqsoff_tracer_call(unsigned long ip, unsigned long parent_ip) disabled =atomic_inc_return (&data->disabled);if (likely (disabled ==1 )) -trace_function (tr, data, ip, parent_ip, flags,preempt_count ()); +trace_function (tr, ip, parent_ip, flags,preempt_count ());atomic_dec (&data->disabled); }
@@ -153,7 +153,7 @@ check_critical_timing(struct trace_array *tr,if (!report_latency (delta)) goto out_unlock; -trace_function (tr, data,CALLER_ADDR0 , parent_ip, flags, pc); +trace_function (tr,CALLER_ADDR0 , parent_ip, flags, pc); latency =nsecs_to_usecs (delta);
@@ -177,7 +177,7 @@ out: data->critical_sequence = max_sequence; data->preempt_timestamp =ftrace_now (cpu);tracing_reset (tr, cpu); -trace_function (tr, data,CALLER_ADDR0 , parent_ip, flags, pc); +trace_function (tr,CALLER_ADDR0 , parent_ip, flags, pc); } static inline void
@@ -210,7 +210,7 @@ start_critical_timing(unsigned long ip, unsigned long parent_ip)local_save_flags (flags); -trace_function (tr, data, ip, parent_ip, flags,preempt_count ()); +trace_function (tr, ip, parent_ip, flags,preempt_count ());per_cpu (tracing_cpu, cpu) =1 ;
@@ -244,7 +244,7 @@ stop_critical_timing(unsigned long ip, unsigned long parent_ip)atomic_inc (&data->disabled);local_save_flags (flags); -trace_function (tr, data, ip, parent_ip, flags,preempt_count ()); +trace_function (tr, ip, parent_ip, flags,preempt_count ());check_critical_timing (tr, data, parent_ip ? : ip, cpu); data->critical_start =0 ;atomic_dec (&data->disabled);
kernel/trace/trace_sched_switch.c +2 -2
@@ -43,7 +43,7 @@ probe_sched_switch(struct rq *__rq, struct task_struct *prev, data = ctx_trace->data[cpu];if (likely (!atomic_read (&data->disabled))) -tracing_sched_switch_trace (ctx_trace, data, prev, next, flags, pc); +tracing_sched_switch_trace (ctx_trace, prev, next, flags, pc);local_irq_restore (flags); }
@@ -66,7 +66,7 @@ probe_sched_wakeup(struct rq *__rq, struct task_struct *wakee, int success) data = ctx_trace->data[cpu];if (likely (!atomic_read (&data->disabled))) -tracing_sched_wakeup_trace (ctx_trace, data, wakee, current, +tracing_sched_wakeup_trace (ctx_trace, wakee, current, flags, pc);local_irq_restore (flags);
kernel/trace/trace_sched_wakeup.c +5 -7
@@ -72,7 +72,7 @@ wakeup_tracer_call(unsigned long ip, unsigned long parent_ip)if (task_cpu (wakeup_task) != cpu) goto unlock; -trace_function (tr, data, ip, parent_ip, flags, pc); +trace_function (tr, ip, parent_ip, flags, pc); unlock:__raw_spin_unlock (&wakeup_lock);
@@ -152,8 +152,8 @@ probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev,if (unlikely (!tracer_enabled || next != wakeup_task)) goto out_unlock; -trace_function (wakeup_trace, data,CALLER_ADDR1 ,CALLER_ADDR2 , flags, pc); -tracing_sched_switch_trace (wakeup_trace, data, prev, next, flags, pc); +trace_function (wakeup_trace,CALLER_ADDR1 ,CALLER_ADDR2 , flags, pc); +tracing_sched_switch_trace (wakeup_trace, prev, next, flags, pc);/* * usecs conversion is slow so we try to delay the conversion
@@ -254,10 +254,8 @@ probe_wakeup(struct rq *rq, struct task_struct *p, int success) data = wakeup_trace->data[wakeup_cpu]; data->preempt_timestamp =ftrace_now (cpu); -tracing_sched_wakeup_trace (wakeup_trace, data, p, current, - flags, pc); -trace_function (wakeup_trace, data,CALLER_ADDR1 ,CALLER_ADDR2 , - flags, pc); +tracing_sched_wakeup_trace (wakeup_trace, p, current, flags, pc); +trace_function (wakeup_trace,CALLER_ADDR1 ,CALLER_ADDR2 , flags, pc); out_locked:__raw_spin_unlock (&wakeup_lock);
Signature · 1 line
1.6.0.6