---

yaml --- r: 169908 b: refs/heads/master c: 498657a h: refs/heads/master v: v3
git-mirror · Nov 15, 2009 · 81bbc5f · 81bbc5f
1 parent 027c108
commit 81bbc5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 055a00865dcfc8e61f3cbefbb879c9577bd36ae5
+refs/heads/master: 498657a478c60be092208422fefa9c7b248729c2
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -2758,9 +2758,9 @@ static void finish_task_switch(struct rq *rq, struct task_struct *prev)
 	prev_state = prev->state;
 	finish_arch_switch(prev);
 	perf_event_task_sched_in(current, cpu_of(rq));
+	fire_sched_in_preempt_notifiers(current);
 	finish_lock_switch(rq, prev);
 
-	fire_sched_in_preempt_notifiers(current);
 	if (mm)
 		mmdrop(mm);
 	if (unlikely(prev_state == TASK_DEAD)) {