Fix another merge-related problem. I think this may resolve the

thread-hang-at-exit issues.

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

diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index d8a7426b9a084c8162b1bf117343c8b533d13162..54505bbe282abf07b6a38ee66a108eefe40f2b0d 100644 (file)
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -4990,7 +4990,6 @@ POST(sys_waitpid)
 PRE(sys_wait4, MayBlock)
 {
    PRINT("sys_wait4 ( %d, %p, %d, %p )", ARG1,ARG2,ARG3,ARG4);
-   ARG3 &= ~(__VKI_WCLONE | __VKI_WALL);
 
    PRE_REG_READ4(long, "wait4", 
                  vki_pid_t, pid, unsigned int *, status, int, options,