openrisc: tracehook_signal_handler() is supposed to be called on success

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / openrisc / kernel / signal.c

diff --git a/arch/openrisc/kernel/signal.c b/arch/openrisc/kernel/signal.c
index 721c584ff44a543973451f55d76c66873496c1f4..6c41778410e6fa33a68112c3a7c962aefcc74479 100644 (file)
--- a/arch/openrisc/kernel/signal.c
+++ b/arch/openrisc/kernel/signal.c
@@ -251,7 +251,7 @@ give_sigsegv:
        return -EFAULT;
 }
 
-static inline int
+static inline void
 handle_signal(unsigned long sig,
              siginfo_t *info, struct k_sigaction *ka,
              struct pt_regs *regs)
@@ -260,11 +260,13 @@ handle_signal(unsigned long sig,
 
        ret = setup_rt_frame(sig, ka, info, sigmask_to_save(), regs);
        if (ret)
-               return ret;
+               return;
 
        block_sigmask(ka, sig);
+       clear_thread_flag(TIF_RESTORE_SIGMASK);
 
-       return 0;
+       tracehook_signal_handler(sig, info, ka, regs,
+                                test_thread_flag(TIF_SINGLESTEP));
 }
 
 /*
@@ -341,18 +343,8 @@ void do_signal(struct pt_regs *regs)
                 * back */
                restore_saved_sigmask();
        } else {                /* signr > 0 */
-
                /* Whee!  Actually deliver the signal.  */
-               if (!handle_signal(signr, &info, &ka, regs)) {
-                       /* a signal was successfully delivered; the saved
-                        * sigmask will have been stored in the signal frame,
-                        * and will be restored by sigreturn, so we can simply
-                        * clear the TIF_RESTORE_SIGMASK flag */
-                       clear_thread_flag(TIF_RESTORE_SIGMASK);
-               }
-
-               tracehook_signal_handler(signr, &info, &ka, regs,
-                                        test_thread_flag(TIF_SINGLESTEP));
+               handle_signal(signr, &info, &ka, regs);
        }
 
        return;