Module Name: src
Committed By: skrll
Date: Mon Mar 25 21:58:00 UTC 2013
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_2835_arm.c
Log Message:
Remove a bogus KASSERT and improve a comment while I'm nearby.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c:1.2 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c:1.3
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c:1.2 Mon Mar 25 21:55:11 2013
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c Mon Mar 25 21:58:00 2013
@@ -341,11 +341,9 @@ vchiq_prepare_bulk_data(VCHIQ_BULK_T *bu
pagelist->offset = va & PAGE_MASK;
/*
- * busdma coalesce contiguous pages for us
+ * busdma already coalesces contiguous pages for us
*/
for (int i = 0; i < bi->dmamap->dm_nsegs; i++) {
- KASSERT(bi->dmamap->dm_segs[i].ds_len / PAGE_SIZE < PAGE_SIZE);
-
pagelist->addrs[i] = bi->dmamap->dm_segs[i].ds_addr & ~PAGE_MASK;
pagelist->addrs[i] |= atop(round_page(bi->dmamap->dm_segs[i].ds_len)) - 1;
}