--- /usr/src/linux-2.5.50-bk7-posix/arch/i386/kernel/signal.c~ Sat Dec 7 21:36:11 2002 +++ /usr/src/linux-2.5.50-bk7-posix/arch/i386/kernel/signal.c Tue Dec 10 00:06:10 2002 @@ -505,9 +505,8 @@ /* Are we from a system call? */ if (regs->orig_eax >= 0) { /* If so, check system call restarting.. */ + current_thread_info()->restart_block.fl = 0; switch (regs->eax) { - case -ERESTART_RESTARTBLOCK: - current_thread_info()->restart_block.fn = do_no_restart_syscall; case -ERESTARTNOHAND: regs->eax = -EINTR; break; @@ -591,10 +590,6 @@ regs->eax == -ERESTARTSYS || regs->eax == -ERESTARTNOINTR) { regs->eax = regs->orig_eax; - regs->eip -= 2; - } - if (regs->eax == -ERESTART_RESTARTBLOCK){ - regs->eax = __NR_restart_syscall; regs->eip -= 2; } } --- /usr/src/linux-2.5.50-bk7-posix/include/linux/thread_info.h~ Sat Dec 7 21:36:43 2002 +++ /usr/src/linux-2.5.50-bk7-posix/include/linux/thread_info.h Tue Dec 10 00:12:31 2002 @@ -11,7 +11,7 @@ * System call restart block. */ struct restart_block { - long (*fn)(struct restart_block *); + long fl; unsigned long arg0, arg1, arg2; }; --- /usr/src/linux-2.5.50-bk7-posix/include/asm-i386/thread_info.h~ Sat Dec 7 21:36:41 2002 +++ /usr/src/linux-2.5.50-bk7-posix/include/asm-i386/thread_info.h Tue Dec 10 00:09:32 2002 @@ -68,7 +68,7 @@ .preempt_count = 1, \ .addr_limit = KERNEL_DS, \ .restart_block = { \ - .fn = do_no_restart_syscall, \ + .fl = 0, \ }, \ }