From owner-p4-projects@FreeBSD.ORG  Wed Sep 20 13:00:46 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 574C116A5E3; Wed, 20 Sep 2006 13:00:46 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2613416A5D6
	for <perforce@FreeBSD.org>; Wed, 20 Sep 2006 13:00:46 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4541D43DBD
	for <perforce@FreeBSD.org>; Wed, 20 Sep 2006 13:00:05 +0000 (GMT)
	(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 k8KD05Kj021987
	for <perforce@FreeBSD.org>; Wed, 20 Sep 2006 13:00:05 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KD05rN021984
	for perforce@freebsd.org; Wed, 20 Sep 2006 13:00:05 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Wed, 20 Sep 2006 13:00:05 GMT
Message-Id: <200609201300.k8KD05rN021984@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 106396 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: Wed, 20 Sep 2006 13:00:46 -0000

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

Change 106396 by rdivacky@rdivacky_witten on 2006/09/20 12:59:27

	Remove ifdef __i386__ thus enabling this to compile on amd64.

Affected files ...

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

Differences ...

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

@@ -109,10 +109,8 @@
 	struct futex *newf;
 	int timeout_hz;
 	struct timeval tv = {0, 0};
-#ifdef __i386__
 	struct futex *f2;
 	int op_ret;
-#endif
 
 #ifdef	DEBUG
 	if (ldebug(sys_futex))
@@ -266,7 +264,6 @@
 		break;
 
 	case LINUX_FUTEX_WAKE_OP:
-#ifdef	__i386__
 		FUTEX_SYSTEM_LOCK;
 #ifdef DEBUG
 		if (ldebug(sys_futex))
@@ -314,9 +311,6 @@
 		td->td_retval[0] = ret;
 
 		FUTEX_SYSTEM_UNLOCK;
-#else
-		printf("linux_sys_futex: wake_op not implemented");
-#endif
 	   	break;
 
 	default: