Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41dfba43 authored by Carsten Emde's avatar Carsten Emde Committed by Steven Rostedt
Browse files

tracing: remove unused local variables in tracer probe functions 



When the nsecs_to_usecs() conversion in probe_wakeup_sched_switch() and
check_critical_timing() was moved to a later stage in order to avoid
unnecessary computing, it was overlooked to remove the original
variables, assignments and comments..

Signed-off-by: default avatarCarsten Emde <C.Emde@osadl.org>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent fe63b94a

kernel/trace/trace_irqsoff.c

+1 −11
Original line number Diff line number Diff line
@@ -129,15 +129,10 @@ check_critical_timing(struct trace_array *tr, 
		      unsigned long parent_ip,

		      int cpu)

{

	unsigned long latency, t0, t1;

	cycle_t T0, T1, delta;

	unsigned long flags;

	int pc;



	/*

	 * usecs conversion is slow so we try to delay the conversion

	 * as long as possible:

	 */

	T0 = data->preempt_timestamp;

	T1 = ftrace_now(cpu);

	delta = T1-T0;
@@ -157,17 +152,12 @@ check_critical_timing(struct trace_array *tr, 


	trace_function(tr, CALLER_ADDR0, parent_ip, flags, pc);



	latency = nsecs_to_usecs(delta);



	if (data->critical_sequence != max_sequence)

		goto out_unlock;



	tracing_max_latency = delta;

	t0 = nsecs_to_usecs(T0);

	t1 = nsecs_to_usecs(T1);



	data->critical_end = parent_ip;



	tracing_max_latency = delta;

	update_max_tr_single(tr, current, cpu);



	max_sequence++;

kernel/trace/trace_sched_wakeup.c

+0 −10
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ static void notrace 
probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev,

	struct task_struct *next)

{

	unsigned long latency = 0, t0 = 0, t1 = 0;

	struct trace_array_cpu *data;

	cycle_t T0, T1, delta;

	unsigned long flags;
@@ -156,10 +155,6 @@ probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev, 
	trace_function(wakeup_trace, CALLER_ADDR0, CALLER_ADDR1, flags, pc);

	tracing_sched_switch_trace(wakeup_trace, prev, next, flags, pc);



	/*

	 * usecs conversion is slow so we try to delay the conversion

	 * as long as possible:

	 */

	T0 = data->preempt_timestamp;

	T1 = ftrace_now(cpu);

	delta = T1-T0;
@@ -167,12 +162,7 @@ probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev, 
	if (!report_latency(delta))

		goto out_unlock;



	latency = nsecs_to_usecs(delta);



	tracing_max_latency = delta;

	t0 = nsecs_to_usecs(T0);

	t1 = nsecs_to_usecs(T1);



	update_max_tr(wakeup_trace, wakeup_task, wakeup_cpu);



out_unlock: