From owner-p4-projects@FreeBSD.ORG Wed Feb 21 09:03:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75B9516E18E; Wed, 21 Feb 2007 09:03:50 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2BD9916DF16 for ; Wed, 21 Feb 2007 09:03:50 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1B32413C461 for ; Wed, 21 Feb 2007 09:03:50 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1L93nNl081397 for ; Wed, 21 Feb 2007 09:03:49 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1L93n2f081393 for perforce@freebsd.org; Wed, 21 Feb 2007 09:03:49 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 21 Feb 2007 09:03:49 GMT Message-Id: <200702210903.l1L93n2f081393@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Feb 2007 09:03:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=114786 Change 114786 by rdivacky@rdivacky_witten on 2007/02/21 09:02:58 In the FUTEX_WAKE_OP the *timeout param is being abused for number of wakes up. Change the code accordingly. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#10 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#10 (text+ko) ==== @@ -304,12 +304,10 @@ if (op_ret > 0) { op_ret = 0; /* - * Linux uses the address of the timespec parameter - * as the number of retries, so any large number will - * be ok. + * Linux abuses the address of the timespec parameter + * as the number of retries. */ op_ret += futex_wake(f2, (int) (unsigned long) args->timeout, NULL); -// op_ret += futex_wake(f2, 0xffffffff, NULL); ret += op_ret; } futex_put(f2);