From fd928ab4ca0808f23b3a5f0a00e648274dfb756c Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 19 Dec 2008 01:09:51 +0100 Subject: [PATCH] --- yaml --- r: 121295 b: refs/heads/master c: c71dd42db2c6f1637b92502a214587431c1a6ad2 h: refs/heads/master i: 121293: 3d7d2da2dea247e2b937468d831c80f9533c49ce 121291: 26f082877fff96a19407130aa29c6600f96ecefb 121287: ed86499adf478085799ec02e661c39954e4ddfcd 121279: ae4a5d8a02027aadda7db7553b32d7408ea1ce26 v: v3 --- [refs] | 2 +- trunk/include/trace/sched.h | 4 ++-- trunk/kernel/sched.c | 2 +- trunk/kernel/trace/trace_sched_switch.c | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 21fa2db8416a..88ca85dea63c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bddb9a3246f6df5cf3b7655cb541ac10203bb71 +refs/heads/master: c71dd42db2c6f1637b92502a214587431c1a6ad2 diff --git a/trunk/include/trace/sched.h b/trunk/include/trace/sched.h index f4549d506b16..bc4c9eadc6ba 100644 --- a/trunk/include/trace/sched.h +++ b/trunk/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/trunk/kernel/sched.c b/trunk/kernel/sched.c index d377097572f9..ac5a70a87d1e 100644 --- a/trunk/kernel/sched.c +++ b/trunk/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/trunk/kernel/trace/trace_sched_switch.c b/trunk/kernel/trace/trace_sched_switch.c index 863390557b44..781d72ef873c 100644 --- a/trunk/kernel/trace/trace_sched_switch.c +++ b/trunk/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); +