Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/arm/arm32/bus_dma.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/arm/arm32/bus_dma.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.50.44.2 retrieving revision 1.51 diff -u -p -r1.50.44.2 -r1.51 --- src/sys/arch/arm/arm32/bus_dma.c 2008/06/17 09:13:55 1.50.44.2 +++ src/sys/arch/arm/arm32/bus_dma.c 2008/04/28 20:23:13 1.51 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.50.44.2 2008/06/17 09:13:55 yamt Exp $ */ +/* $NetBSD: bus_dma.c,v 1.51 2008/04/28 20:23:13 martin Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #define _ARM32_BUS_DMA_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.50.44.2 2008/06/17 09:13:55 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.51 2008/04/28 20:23:13 martin Exp $"); #include #include @@ -798,7 +798,7 @@ _bus_dmamem_free(bus_dma_tag_t t, bus_dm addr < (segs[curseg].ds_addr + segs[curseg].ds_len); addr += PAGE_SIZE) { m = PHYS_TO_VM_PAGE(addr); - TAILQ_INSERT_TAIL(&mlist, m, pageq.queue); + TAILQ_INSERT_TAIL(&mlist, m, pageq); } } uvm_pglistfree(&mlist); @@ -1058,9 +1058,9 @@ _bus_dmamem_alloc_range(bus_dma_tag_t t, #ifdef DEBUG_DMA printf("alloc: page %lx\n", lastaddr); #endif /* DEBUG_DMA */ - m = TAILQ_NEXT(m, pageq.queue); + m = TAILQ_NEXT(m, pageq); - for (; m != NULL; m = TAILQ_NEXT(m, pageq.queue)) { + for (; m != NULL; m = TAILQ_NEXT(m, pageq)) { curaddr = VM_PAGE_TO_PHYS(m); #ifdef DIAGNOSTIC if (curaddr < low || curaddr >= high) {