Merge tag 'please-pull-misc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / arch / tile / kernel / process.c

diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c
index 622560030a5839c1e93d0fb5a1753809f2e0db5e..307d010696c994d1db638accea596c01ba46ebbf 100644 (file)
--- a/arch/tile/kernel/process.c
+++ b/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;