From owner-p4-projects@FreeBSD.ORG  Sun Nov 26 11:34:59 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F0B4816A417; Sun, 26 Nov 2006 11:34:58 +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 CBAD716A415
	for <perforce@freebsd.org>; Sun, 26 Nov 2006 11:34:58 +0000 (UTC)
	(envelope-from netchild@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0E72443D4C
	for <perforce@freebsd.org>; Sun, 26 Nov 2006 11:34:05 +0000 (GMT)
	(envelope-from netchild@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 kAQBYwOQ000148
	for <perforce@freebsd.org>; Sun, 26 Nov 2006 11:34:58 GMT
	(envelope-from netchild@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAQBYweG000143
	for perforce@freebsd.org; Sun, 26 Nov 2006 11:34:58 GMT
	(envelope-from netchild@freebsd.org)
Date: Sun, 26 Nov 2006 11:34:58 GMT
Message-Id: <200611261134.kAQBYweG000143@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	netchild@freebsd.org using -f
From: Alexander Leidinger <netchild@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 110541 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2006 11:34:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=110541

Change 110541 by netchild@netchild_magellan on 2006/11/26 11:34:28

	Sync with rev 1.7 in NetBSD.
	Obtained from:	NetBSD

Affected files ...

.. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#8 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#8 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_futex.c,v 1.5 2005/11/23 16:14:57 manu Exp $ */
+/*	$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $ */
 
 /*-
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.6 2006/09/09 16:25:25 netchild Exp $");
 #if 0
-__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.5 2005/11/23 16:14:57 manu Exp $");
+__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $");
 #endif
 
 #include "opt_compat.h"
@@ -386,6 +386,11 @@
 		    timeout);
 #endif
 	ret = tsleep(wp, PCATCH | PZERO, "linuxfutex", timeout);
+#ifdef DEBUG
+	if (ldebug(sys_futex))
+		printf("FUTEX -> %d tsleep returns %d\n",
+		    td->td_proc->p_pid, ret);
+#endif
 
 	FUTEX_LOCK;
 	TAILQ_REMOVE(&f->f_waiting_proc, wp, wp_list);