PERFORCE change 94790 for review

[John-Mark Gurney]

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

Change 94790 by jmg at 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;