From ee3f3e5c69bb9deecf11f0f01fd379743a1e3b3d Mon Sep 17 00:00:00 2001 From: Andrew Vagin Date: Thu, 12 Jul 2012 14:14:29 +0400 Subject: [PATCH] --- yaml --- r: 320461 b: refs/heads/master c: 895dd92c032e1604aa0d7afaef7716e058343b67 h: refs/heads/master i: 320459: 8aa8bde721f71e49693434f4f21f8ff255eeb962 v: v3 --- [refs] | 2 +- trunk/kernel/sched/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 36f8f5c6b9b3..b777a8c831cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 045e7e6047037d93824d265cc30c33eb631f8883 +refs/heads/master: 895dd92c032e1604aa0d7afaef7716e058343b67 diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c index 468bdd44c1ba..ad732b56ba70 100644 --- a/trunk/kernel/sched/core.c +++ b/trunk/kernel/sched/core.c @@ -1910,12 +1910,12 @@ static inline void prepare_task_switch(struct rq *rq, struct task_struct *prev, struct task_struct *next) { + trace_sched_switch(prev, next); sched_info_switch(prev, next); perf_event_task_sched_out(prev, next); fire_sched_out_preempt_notifiers(prev, next); prepare_lock_switch(rq, next); prepare_arch_switch(next); - trace_sched_switch(prev, next); } /**