--- strace/syscall.c.orig	2003-09-10 21:02:20.000000000 +0200
+++ strace/syscall.c	2003-09-10 21:04:29.000000000 +0200
@@ -735,6 +735,8 @@
 	int pid = tcp->pid;
 #endif /* !PROCFS */
 
+	if (tcp->flags & TCB_INSYSCALL)
+		return 1;
 #ifdef LINUX
 #if defined(S390) || defined(S390X)
 	if (tcp->flags & TCB_WAITEXECVE) {
@@ -1197,8 +1199,7 @@
 #endif /* FREEBSD */
 #endif /* !HAVE_PR_SYSCALL */
 #endif /* USE_PROCFS */
-	if (!(tcp->flags & TCB_INSYSCALL))
-		tcp->scno = scno;
+	tcp->scno = scno;
 	return 1;
 }