Commit dbf18c8f authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds

m68knommu: fix syscall restart handling

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: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ada8d218
...@@ -781,15 +781,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs) ...@@ -781,15 +781,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
/* Did we come from a system call? */ /* Did we come from a system call? */
if (regs->orig_d0 >= 0) { if (regs->orig_d0 >= 0) {
/* Restart the system call - no handlers present */ /* Restart the system call - no handlers present */
if (regs->d0 == -ERESTARTNOHAND handle_restart(regs, NULL, 0);
|| 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;
}
} }
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment