aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/kernel/signal.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/kernel/signal.c b/arch/sh/kernel/signal.c
index fdca038e4b91..e323e299878b 100644
--- a/arch/sh/kernel/signal.c
+++ b/arch/sh/kernel/signal.c
@@ -268,7 +268,7 @@ asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
268badframe: 268badframe:
269 force_sig(SIGSEGV, current); 269 force_sig(SIGSEGV, current);
270 return 0; 270 return 0;
271} 271}
272 272
273/* 273/*
274 * Set up a signal frame. 274 * Set up a signal frame.
@@ -489,6 +489,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
489 if (regs->tra >= 0) { 489 if (regs->tra >= 0) {
490 /* If so, check system call restarting.. */ 490 /* If so, check system call restarting.. */
491 switch (regs->regs[0]) { 491 switch (regs->regs[0]) {
492 case -ERESTART_RESTARTBLOCK:
492 case -ERESTARTNOHAND: 493 case -ERESTARTNOHAND:
493 regs->regs[0] = -EINTR; 494 regs->regs[0] = -EINTR;
494 break; 495 break;
@@ -584,8 +585,8 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)
584 signr = get_signal_to_deliver(&info, &ka, regs, NULL); 585 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
585 if (signr > 0) { 586 if (signr > 0) {
586 /* Whee! Actually deliver the signal. */ 587 /* Whee! Actually deliver the signal. */
587 if (handle_signal(signr, &ka, &info, oldset, regs, save_r0) 588 if (handle_signal(signr, &ka, &info, oldset,
588 == 0) { 589 regs, save_r0) == 0) {
589 /* a signal was successfully delivered; the saved 590 /* a signal was successfully delivered; the saved
590 * sigmask will have been stored in the signal frame, 591 * sigmask will have been stored in the signal frame,
591 * and will be restored by sigreturn, so we can simply 592 * and will be restored by sigreturn, so we can simply