PERFORCE change 135008 for review
Kip Macy
kmacy at FreeBSD.org
Thu Feb 7 20:13:49 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=135008
Change 135008 by kmacy at 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;
}
More information about the p4-projects
mailing list