From 81bbc5f2bec3e32f052ed853ac2a6a2c7dca6a32 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 13 Nov 2009 18:33:53 +0900
Subject: [PATCH] --- yaml --- r: 169908 b: refs/heads/master c:
 498657a478c60be092208422fefa9c7b248729c2 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5b4a911115d3..d14e29df6099 100644
--- 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
index 701eca4958a2..cea2beac7909 100644
--- 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)) {