---

yaml --- r: 182360 b: refs/heads/master c: 8381f65 h: refs/heads/master v: v3
git-mirror · Jan 13, 2010 · 6ea1e8c · 6ea1e8c
1 parent 2beba1e
commit 6ea1e8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf5531148ff34938840d6da775c0a4ace442d573
+refs/heads/master: 8381f65d097dad90416808314737dd7d3ae38ea9
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -2783,7 +2783,13 @@ static void finish_task_switch(struct rq *rq, struct task_struct *prev)
 	 */
 	prev_state = prev->state;
 	finish_arch_switch(prev);
+#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
+	local_irq_disable();
+#endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */
 	perf_event_task_sched_in(current);
+#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
+	local_irq_enable();
+#endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */
 	finish_lock_switch(rq, prev);
 
 	fire_sched_in_preempt_notifiers(current);