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

Commit c71dd42d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

tracing: fix warnings in kernel/trace/trace_sched_switch.c 



these warnings:

  kernel/trace/trace_sched_switch.c: In function ‘tracing_sched_register’:
  kernel/trace/trace_sched_switch.c:96: warning: passing argument 1 of ‘register_trace_sched_wakeup_new’ from incompatible pointer type
  kernel/trace/trace_sched_switch.c:112: warning: passing argument 1 of ‘unregister_trace_sched_wakeup_new’ from incompatible pointer type
  kernel/trace/trace_sched_switch.c: In function ‘tracing_sched_unregister’:
  kernel/trace/trace_sched_switch.c:121: warning: passing argument 1 of ‘unregister_trace_sched_wakeup_new’ from incompatible pointer type

Trigger because sched_wakeup_new tracepoints need the same trace
signature as sched_wakeup - which was changed recently.

Fix it.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3bddb9a3

include/trace/sched.h

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ DECLARE_TRACE(sched_wakeup, 
		TPARGS(rq, p));



DECLARE_TRACE(sched_wakeup_new,

	TPPROTO(struct rq *rq, struct task_struct *p),

		TPARGS(rq, p));

	TPPROTO(struct rq *rq, struct task_struct *p, int success),

		TPARGS(rq, p, success));



DECLARE_TRACE(sched_switch,

	TPPROTO(struct rq *rq, struct task_struct *prev,

kernel/sched.c

+1 −1
Original line number Diff line number Diff line
@@ -2457,7 +2457,7 @@ void wake_up_new_task(struct task_struct *p, unsigned long clone_flags) 
		p->sched_class->task_new(rq, p);

		inc_nr_running(rq);

	}

	trace_sched_wakeup_new(rq, p);

	trace_sched_wakeup_new(rq, p, 1);

	check_preempt_curr(rq, p, 0);

#ifdef CONFIG_SMP

	if (p->sched_class->task_wake_up)

kernel/trace/trace_sched_switch.c

+1 −0
Original line number Diff line number Diff line
@@ -247,3 +247,4 @@ __init static int init_sched_switch_trace(void) 
	return register_tracer(&sched_switch_trace);

}

device_initcall(init_sched_switch_trace);