From owner-p4-projects@FreeBSD.ORG  Tue Jul 17 11:24:16 2007
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 C7D1216A405; Tue, 17 Jul 2007 11:24:15 +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 9EC2016A401
	for <perforce@FreeBSD.org>; Tue, 17 Jul 2007 11:24:15 +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 8FD5C13C491
	for <perforce@FreeBSD.org>; Tue, 17 Jul 2007 11:24:15 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6HBOFpV093133
	for <perforce@FreeBSD.org>; Tue, 17 Jul 2007 11:24:15 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6HBOFab093130
	for perforce@freebsd.org; Tue, 17 Jul 2007 11:24:15 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Tue, 17 Jul 2007 11:24:15 GMT
Message-Id: <200707171124.l6HBOFab093130@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 123638 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: Tue, 17 Jul 2007 11:24:16 -0000

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

Change 123638 by rdivacky@rdivacky_witten on 2007/07/17 11:23:53

	make copyout work. epoll_wait still does not work properly ;(

Affected files ...

.. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.c#5 edit

Differences ...

==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.c#5 (text+ko) ====

@@ -103,9 +103,9 @@
 		linux_kevent_to_epoll(&kevp[i], &eep[i]);
 	}
 	
-	error = copyout(eep, uap->changelist, count * sizeof(*eep));
+	error = copyout(eep, uap->eventlist, count * sizeof(*eep));
 	if (error)	
-		uap->eventlist += count;
+		uap->eventlist = (struct kevent *)((char *)uap->eventlist + count * sizeof(*eep));
 
 	free(eep, M_TEMP);
 	return (0);