aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/kernel/signal.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m68knommu/kernel/signal.c')
-rw-r--r--arch/m68knommu/kernel/signal.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/m68knommu/kernel/signal.c b/arch/m68knommu/kernel/signal.c
index c973230dad82..c070f3f64255 100644
--- a/arch/m68knommu/kernel/signal.c
+++ b/arch/m68knommu/kernel/signal.c
@@ -717,7 +717,7 @@ handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
717 * want to handle. Thus you cannot kill init even with a SIGKILL even by 717 * want to handle. Thus you cannot kill init even with a SIGKILL even by
718 * mistake. 718 * mistake.
719 */ 719 */
720asmlinkage int do_signal(struct pt_regs *regs) 720asmlinkage void do_signal(struct pt_regs *regs)
721{ 721{
722 struct k_sigaction ka; 722 struct k_sigaction ka;
723 siginfo_t info; 723 siginfo_t info;
@@ -731,7 +731,7 @@ asmlinkage int do_signal(struct pt_regs *regs)
731 * if so. 731 * if so.
732 */ 732 */
733 if (!user_mode(regs)) 733 if (!user_mode(regs))
734 return 1; 734 return;
735 735
736 if (test_thread_flag(TIF_RESTORE_SIGMASK)) 736 if (test_thread_flag(TIF_RESTORE_SIGMASK))
737 oldset = &current->saved_sigmask; 737 oldset = &current->saved_sigmask;
@@ -743,7 +743,7 @@ asmlinkage int do_signal(struct pt_regs *regs)
743 /* Whee! Actually deliver the signal. */ 743 /* Whee! Actually deliver the signal. */
744 handle_signal(signr, &ka, &info, oldset, regs); 744 handle_signal(signr, &ka, &info, oldset, regs);
745 clear_thread_flag(TIF_RESTORE_SIGMASK); 745 clear_thread_flag(TIF_RESTORE_SIGMASK);
746 return 1; 746 return;
747 } 747 }
748 748
749 /* Did we come from a system call? */ 749 /* Did we come from a system call? */
@@ -757,5 +757,4 @@ asmlinkage int do_signal(struct pt_regs *regs)
757 clear_thread_flag(TIF_RESTORE_SIGMASK); 757 clear_thread_flag(TIF_RESTORE_SIGMASK);
758 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL); 758 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
759 } 759 }
760 return 0;
761} 760}