diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-12 11:47:53 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-12 11:47:53 -0700 |
| commit | 5145edef1efa16e6947c27c7487fac545e8b5939 (patch) | |
| tree | 835d67bb642027c7abaa62246b450993d250a52f /arch/mips/kernel/signal.c | |
| parent | 451bdbef06b85c4e82538debfd7b295fa08fe501 (diff) | |
| parent | 5d9d49c51678f5e4c37ce661b4573d73fb391040 (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase
Conflicts:
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci.h
Diffstat (limited to 'arch/mips/kernel/signal.c')
| -rw-r--r-- | arch/mips/kernel/signal.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index dbbe0ce48d8..f8524003676 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c @@ -8,6 +8,7 @@ * Copyright (C) 1999, 2000 Silicon Graphics, Inc. */ #include <linux/cache.h> +#include <linux/irqflags.h> #include <linux/sched.h> #include <linux/mm.h> #include <linux/personality.h> @@ -658,6 +659,8 @@ static void do_signal(struct pt_regs *regs) asmlinkage void do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags) { + local_irq_enable(); + /* deal with pending signal delivery */ if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) do_signal(regs); |