patch-2.4.22 linux-2.4.22/arch/parisc/kernel/ccio-dma.c
Next file: linux-2.4.22/arch/parisc/kernel/ccio-rm-dma.c
Previous file: linux-2.4.22/arch/parisc/kernel/cache.c
Back to the patch index
Back to the overall index
- Lines: 66
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/parisc/kernel/ccio-dma.c
- Orig date:
2003-06-13 07:51:31.000000000 -0700
diff -urN linux-2.4.21/arch/parisc/kernel/ccio-dma.c linux-2.4.22/arch/parisc/kernel/ccio-dma.c
@@ -805,7 +805,7 @@
DBG_RUN_SG(" %d : %08lx/%05x %p/%05x\n", nents,
(unsigned long)sg_dma_address(startsg), cnt,
- startsg->address, startsg->length
+ sg_virt_addr(startsg), startsg->length
);
/*
@@ -825,7 +825,7 @@
** Look for a VCONTIG chunk
*/
if (cnt) {
- unsigned long vaddr = (unsigned long)startsg->address;
+ unsigned long vaddr = (unsigned long) sg_virt_addr(startsg);
ASSERT(pdirp);
/* Since multiple Vcontig blocks could make up
@@ -878,8 +878,8 @@
*/
dma_sg = vcontig_sg = startsg;
dma_len = vcontig_len = vcontig_end = startsg->length;
- vcontig_end += (unsigned long) startsg->address;
- dma_offset = (unsigned long) startsg->address & ~IOVP_MASK;
+ vcontig_end += (unsigned long) sg_virt_addr(startsg);
+ dma_offset = (unsigned long) sg_virt_addr(startsg) & ~IOVP_MASK;
/* PARANOID: clear entries */
sg_dma_address(startsg) = 0;
@@ -893,7 +893,7 @@
unsigned long startsg_end;
startsg++;
- startsg_end = (unsigned long)startsg->address +
+ startsg_end = (unsigned long) sg_virt_addr(startsg) +
startsg->length;
/* PARANOID: clear entries */
@@ -912,7 +912,7 @@
/*
** Append the next transaction?
*/
- if(vcontig_end == (unsigned long) startsg->address) {
+ if(vcontig_end == (unsigned long) sg_virt_addr(startsg)) {
vcontig_len += startsg->length;
vcontig_end += startsg->length;
dma_len += startsg->length;
@@ -981,7 +981,8 @@
/* Fast path single entry scatterlists. */
if(nents == 1) {
- sg_dma_address(sglist)= ccio_map_single(dev, sglist->address,
+ sg_dma_address(sglist)= ccio_map_single(dev,
+ sg_virt_addr(sglist),
sglist->length,
direction);
sg_dma_len(sglist)= sglist->length;
@@ -1043,7 +1044,7 @@
ioc = GET_IOC(dev);
DBG_RUN_SG("%s() START %d entries, %p,%x\n",
- __FUNCTION__, nents, sglist->address, sglist->length);
+ __FUNCTION__, nents, sg_virt_address(sglist), sglist->length);
#ifdef CONFIG_PROC_FS
ioc->usg_calls++;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)