From owner-p4-projects@FreeBSD.ORG  Fri Feb  8 04:13:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 285CE16A4DC; Fri,  8 Feb 2008 04:13:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3FCCD16A419
	for <perforce@freebsd.org>; Fri,  8 Feb 2008 04:13:48 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 34D5913C448
	for <perforce@freebsd.org>; Fri,  8 Feb 2008 04:13:48 +0000 (UTC)
	(envelope-from kmacy@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 m184DkPR076980
	for <perforce@freebsd.org>; Fri, 8 Feb 2008 04:13:46 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m184Dks8076977
	for perforce@freebsd.org; Fri, 8 Feb 2008 04:13:46 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 8 Feb 2008 04:13:46 GMT
Message-Id: <200802080413.m184Dks8076977@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135008 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: Fri, 08 Feb 2008 04:13:49 -0000

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

Change 135008 by kmacy@kmacy:entropy:iwarp on 2008/02/08 04:13:35

	fix 32-bit build errors

Affected files ...

.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#10 edit
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 edit
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 edit

Differences ...

==== //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#10 (text+ko) ====

@@ -218,8 +218,8 @@
 	for (totcount = i = 0; (i < iovcnt) && (totcount < maxcount);  i++, iov++) {
 		count = maxcount - totcount;
 		    
-		start = (uint64_t)iov->iov_base;
-		end = (uint64_t)((caddr_t)iov->iov_base + iov->iov_len);
+		start = (uintptr_t)iov->iov_base;
+		end = (uintptr_t)((caddr_t)iov->iov_base + iov->iov_len);
 		start &= PG_FRAME;
 		end += PAGE_MASK;
 		end &= PG_FRAME;
@@ -236,7 +236,7 @@
 		totcount += count;
 		curbytes = iov->iov_len;
 		if (count != npages)
-			curbytes = count*PAGE_SIZE - (((uint64_t)iov->iov_base)&PAGE_MASK);
+			curbytes = count*PAGE_SIZE - (((uintptr_t)iov->iov_base)&PAGE_MASK);
 		totbytes += curbytes;
 	}
 	uio->uio_resid -= totbytes;

==== //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 (text+ko) ====

@@ -155,7 +155,7 @@
 	p->dgl_length = len;
 	p->dgl_offset = pg_off;
 	p->dgl_nelem = npages;
-	printf("hold %jx -> %jx  --- count=%d i=%d\n", addr, addr + npages*PAGE_SIZE, npages, i);
+	printf("hold %zx -> %zx  --- count=%d i=%d\n", addr, addr + npages*PAGE_SIZE, npages, i);
 
 #ifdef NEED_BUSDMA
 	p->phys_addr[0] = pci_map_page(pdev, p->pages[0], pg_off,

==== //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 (text+ko) ====

@@ -120,7 +120,7 @@
 		} else if (m == NULL)
 			rv = vm_fault(map, va, VM_PROT_READ, VM_FAULT_NORMAL);
 		if (rv) {
-			printf("vm_fault bad return rv=%d va=0x%jx\n", rv, va);
+			printf("vm_fault bad return rv=%d va=0x%zx\n", rv, va);
 			
 			goto error;
 		}