Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arc / kernel / signal.c

diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c
index 8222f8c..a78d8f7 100644 (file)
--- a/arch/arc/kernel/signal.c
+++ b/arch/arc/kernel/signal.c
@@ -362,7 +362,7 @@ void do_signal(struct pt_regs *regs)
 
        restart_scall = in_syscall(regs) && syscall_restartable(regs);
 
-       if (get_signal(&ksig)) {
+       if (test_thread_flag(TIF_SIGPENDING) && get_signal(&ksig)) {
                if (restart_scall) {
                        arc_restart_syscall(&ksig.ka, regs);
                        syscall_wont_restart(regs);     /* No more restarts */
@@ -394,6 +394,6 @@ void do_notify_resume(struct pt_regs *regs)
         * ASM glue gaurantees that this is only called when returning to
         * user mode
         */
-       if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
+       if (test_thread_flag(TIF_NOTIFY_RESUME))
                tracehook_notify_resume(regs);
 }