From 6ea1e8c8c4ff9933821a8d3f6401fb5cf31d1fdf Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie.iles@picochip.com>
Date: Fri, 8 Jan 2010 15:27:33 +0000
Subject: [PATCH] --- yaml --- r: 182360 b: refs/heads/master c:
 8381f65d097dad90416808314737dd7d3ae38ea9 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c00a429d2d27..ab2b4b86c03f 100644
--- 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
index e507af086b42..c3ad3427a2a5 100644
--- 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);