Here's a couple more I missed in the last commit.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2604

diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index b99ad5665f1aad6522dafc385fad0f4512020450..0d87da856e2ac55de928e271c59a3704c4908bd2 100644 (file)
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -6148,8 +6148,7 @@ Bool VG_(pre_syscall) ( ThreadId tid )
         VG_(sys_issue)(tid);
       } else {
         /* run the syscall directly */
-        tst->m_eax = VG_(do_syscall)(syscallno, 
-                                     arg1, arg2, arg3, arg4, arg5, arg6);
+        res = VG_(do_syscall)(syscallno, arg1, arg2, arg3, arg4, arg5, arg6);
         syscall_done = True;
       }
    }
@@ -6238,7 +6237,7 @@ void VG_(post_syscall) ( ThreadId tid, Bool restart )
         restarted = True;
         restart_syscall(tid);
       } else
-        tst->m_eax = -VKI_EINTR;
+        res = -VKI_EINTR;
    } 
 
    if (!restarted) {