Skip to content

Commit

Permalink
m68knommu: fix syscall restart handling
Browse files Browse the repository at this point in the history
Fix system call restart handling. We can call directly to the
restart handler, no need to back track through trap that isn't
even implemented on m68knommu.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Greg Ungerer authored and Linus Torvalds committed Oct 23, 2007
1 parent ada8d21 commit dbf18c8
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions arch/m68knommu/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -781,15 +781,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
/* Did we come from a system call? */
if (regs->orig_d0 >= 0) {
/* Restart the system call - no handlers present */
if (regs->d0 == -ERESTARTNOHAND
|| regs->d0 == -ERESTARTSYS
|| regs->d0 == -ERESTARTNOINTR) {
regs->d0 = regs->orig_d0;
regs->pc -= 2;
} else if (regs->d0 == -ERESTART_RESTARTBLOCK) {
regs->d0 = __NR_restart_syscall;
regs->pc -= 2;
}
handle_restart(regs, NULL, 0);
}
return 0;
}

0 comments on commit dbf18c8

Please sign in to comment.