From 99c6d3640908250efa2b6064bb2574285750a811 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Fri, 12 Oct 2012 15:38:54 -0400
Subject: [PATCH] --- yaml --- r: 333981 b: refs/heads/master c:
 c19c6c954b9b264abdc21e0c855118e3daf019b0 h: refs/heads/master i:   333979:
 598ab8be465b73ae294c136065ac0ffafc9a9b6c v: v3

---
 [refs]                           | 2 +-
 trunk/arch/tile/kernel/process.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fafd267c6cee..bb8d6343f8e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d20f2f83b2374c1cee042981cb45493a3e06b6a5
+refs/heads/master: c19c6c954b9b264abdc21e0c855118e3daf019b0
diff --git a/trunk/arch/tile/kernel/process.c b/trunk/arch/tile/kernel/process.c
index 6be799150501..4f1a2413e865 100644
--- a/trunk/arch/tile/kernel/process.c
+++ b/trunk/arch/tile/kernel/process.c
@@ -548,6 +548,9 @@ int do_work_pending(struct pt_regs *regs, u32 thread_info_flags)
 	if (!user_mode(regs))
 		return 0;
 
+	/* Enable interrupts; they are disabled again on return to caller. */
+	local_irq_enable();
+
 	if (thread_info_flags & _TIF_NEED_RESCHED) {
 		schedule();
 		return 1;