From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 16 Jun 2008 09:15:58 +0000 (+0200)
Subject: Merge branch 'linus' into tracing/ftrace
X-Git-Tag: v2.6.27-rc1~1102^2^2~3^2~11
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=e765ee90da62535ac7d7a97f2464f9646539d683;p=sfrench%2Fcifs-2.6.git

Merge branch 'linus' into tracing/ftrace
---

e765ee90da62535ac7d7a97f2464f9646539d683
diff --cc kernel/sched.c
index b8c9fe676221,eaf6751e7612..96fbbbf3722c
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@ -2631,11 -2275,8 +2297,11 @@@ void wake_up_new_task(struct task_struc
  		 * management (if any):
  		 */
  		p->sched_class->task_new(rq, p);
- 		inc_nr_running(rq);
+ 		inc_nr_running(p, rq);
  	}
 +	trace_mark(kernel_sched_wakeup_new,
 +		"pid %d state %ld ## rq %p task %p rq->curr %p",
 +		p->pid, p->state, rq, p, rq->curr);
  	check_preempt_curr(rq, p);
  #ifdef CONFIG_SMP
  	if (p->sched_class->task_wake_up)