aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-19 01:09:51 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-19 01:05:38 +0100
commitc71dd42db2c6f1637b92502a214587431c1a6ad2 (patch)
tree778c7da5c7539cbab90cdbead19d6597529187a7
parent3bddb9a3246f6df5cf3b7655cb541ac10203bb71 (diff)
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: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/trace/sched.h4
-rw-r--r--kernel/sched.c2
-rw-r--r--kernel/trace/trace_sched_switch.c1
3 files changed, 4 insertions, 3 deletions
diff --git a/include/trace/sched.h b/include/trace/sched.h
index f4549d506b1..bc4c9eadc6b 100644
--- a/include/trace/sched.h
+++ b/include/trace/sched.h
@@ -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,
diff --git a/kernel/sched.c b/kernel/sched.c
index d377097572f..ac5a70a87d1 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -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)
diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c
index 863390557b4..781d72ef873 100644
--- a/kernel/trace/trace_sched_switch.c
+++ b/kernel/trace/trace_sched_switch.c
@@ -247,3 +247,4 @@ __init static int init_sched_switch_trace(void)
return register_tracer(&sched_switch_trace);
}
device_initcall(init_sched_switch_trace);
+