From owner-p4-projects@FreeBSD.ORG  Sat Jan 20 10:11:51 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 7F2F616A405; Sat, 20 Jan 2007 10:11:51 +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 455D116A400
	for <perforce@FreeBSD.org>; Sat, 20 Jan 2007 10:11:51 +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 35FCE13C465
	for <perforce@FreeBSD.org>; Sat, 20 Jan 2007 10:11:51 +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 l0KABjSr071334
	for <perforce@FreeBSD.org>; Sat, 20 Jan 2007 10:11:46 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0KABjdk071331
	for perforce@freebsd.org; Sat, 20 Jan 2007 10:11:45 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Sat, 20 Jan 2007 10:11:45 GMT
Message-Id: <200701201011.l0KABjdk071331@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 113203 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: Sat, 20 Jan 2007 10:11:51 -0000

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

Change 113203 by rdivacky@rdivacky_witten on 2007/01/20 10:10:52

	Make mmap code compilable after recent jkim's changes.

Affected files ...

.. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#20 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#20 (text+ko) ====

@@ -593,12 +593,12 @@
 		    args->flags, args->fd, args->pgoff);
 #endif
 
-	linux_args.addr = (l_caddr_t)args->addr;
+	linux_args.addr = args->addr;
 	linux_args.len = args->len;
 	linux_args.prot = args->prot;
 	linux_args.flags = args->flags;
 	linux_args.fd = args->fd;
-	linux_args.pos = args->pgoff * PAGE_SIZE;
+	linux_args.pgoff = args->pgoff * PAGE_SIZE;
 
 	return (linux_mmap_common(td, &linux_args));
 }
@@ -763,7 +763,7 @@
 		bsd_args.addr = (caddr_t)PTRIN(linux_args->addr);
 		bsd_args.len  = linux_args->len;
 	}
-	bsd_args.pos = linux_args->pos;
+	bsd_args.pos = linux_args->pgoff;
 	bsd_args.pad = 0;
 
 #ifdef DEBUG