From: Paul Brook <paul@codesourcery.com>
Date: Fri, 19 Feb 2010 16:04:51 +0000 (+0000)
Subject: Fix strace or FUTEX_PRIVATE_FLAG
X-Git-Tag: v0.13.0-rc0~1364
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f2243f3013956b604b92cb614b8e1a8681e3e74;p=thirdparty%2Fqemu.git

Fix strace or FUTEX_PRIVATE_FLAG

FUTEX_PRIVATE_FLAG is a bit orred with an existing futex op,
not a distinct value.

Signed-off-by: Paul Brook <paul@codesourcery.com>
---

diff --git a/linux-user/strace.c b/linux-user/strace.c
index 6090dcc65da..d77053b3035 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -1252,8 +1252,10 @@ if( cmd == val ) { \
 
     int cmd = (int)tswap32(tflag);
 #ifdef FUTEX_PRIVATE_FLAG
-    if (cmd == FUTEX_PRIVATE_FLAG)
+    if (cmd & FUTEX_PRIVATE_FLAG) {
         gemu_log("FUTEX_PRIVATE_FLAG|");
+        cmd &= ~FUTEX_PRIVATE_FLAG;
+    }
 #endif
     print_op(FUTEX_WAIT)
     print_op(FUTEX_WAKE)