From owner-p4-projects@FreeBSD.ORG  Sat Apr  8 06:02:02 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 6FCCA16A404; Sat,  8 Apr 2006 06:02:02 +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 4AF0816A402
	for <perforce@freebsd.org>; Sat,  8 Apr 2006 06:02:02 +0000 (UTC)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 94E1F43D46
	for <perforce@freebsd.org>; Sat,  8 Apr 2006 06:02:01 +0000 (GMT)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k38621uO097307
	for <perforce@freebsd.org>; Sat, 8 Apr 2006 06:02:01 GMT
	(envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k38621Xg097298
	for perforce@freebsd.org; Sat, 8 Apr 2006 06:02:01 GMT
	(envelope-from jmg@freebsd.org)
Date: Sat, 8 Apr 2006 06:02:01 GMT
Message-Id: <200604080602.k38621Xg097298@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94790 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, 08 Apr 2006 06:02:02 -0000

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

Change 94790 by jmg@jmg_arlene on 2006/04/08 06:01:00

	make compile.

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#4 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#4 (text+ko) ====

@@ -116,6 +116,7 @@
 #include <machine/bus.h>
 #include <machine/bus_private.h>
 #include <machine/hviommu.h>
+#include <machine/iommureg.h>
 #include <machine/pmap.h>
 #include <machine/resource.h>
 
@@ -540,15 +541,16 @@
 	int cntdone;
 	int i;
 
-	for (i = 0; i < cnt; i++)
-		iotteaddr[i] = pmap_kextract(&iottes[i]);
+	for (i = 0; i < iottecnt; i++)
+		iotteaddr[i] = pmap_kextract((vm_offset_t)&iottes[i]);
 
 	/* push tte's */
 	cntdone = 0;
 	while (cntdone < iottecnt) {
 		if ((err = hvio_iommu_map(him->him_handle, HVIOMMU_TSBID(him,
 		    dvmaddr), iottecnt, PCI_MAP_ATTR_READ | PCI_MAP_ATTR_WRITE,
-		    pmap_kextract(&iotteaddr[0]), &mapcnt))) {
+		    (io_page_list_t *)pmap_kextract((vm_offset_t)&iotteaddr[0]),
+		    &mapcnt))) {
 			printf("iommu_map: err: %ld\n", err);
 			mapcnt = 1;
 		}
@@ -618,7 +620,7 @@
 #else
 		if (iottecnt == 0)
 			iottebase = trunc_io_page(dvmaddr);
-		iottes[iottecnt] = MAKEIOTTE(trunc_io_page(curaddr)
+		iottes[iottecnt] = MAKEIOTTE(trunc_io_page(curaddr), 1, 0, 0);
 		if (iottecnt >= IOTTE_CNT) {
 			hviommu_map_pages(him, dvmaddr, iottes, iottecnt);
 			iottecnt = 0;