PERFORCE change 153029 for review

[Hans Petter Selasky]

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

Change 153029 by hselasky at hselasky_laptop001 on 2008/11/16 12:22:55

	
	Revert busdma patch. A new patch will be worked out.

Affected files ...

.. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#11 integrate

Differences ...

==== //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#11 (text+ko) ====

@@ -938,8 +938,7 @@
 		if (op & BUS_DMASYNC_PREWRITE) {
 			while (bpage != NULL) {
 				bcopy((void *)bpage->datavaddr,
-				      (void *)(bpage->vaddr + 
-				       ((vm_offset_t)(bpage->datavaddr) & PAGE_MASK)),
+				      (void *)bpage->vaddr,
 				      bpage->datacount);
 				bpage = STAILQ_NEXT(bpage, links);
 			}
@@ -948,8 +947,7 @@
 
 		if (op & BUS_DMASYNC_POSTREAD) {
 			while (bpage != NULL) {
-				bcopy((void *)(bpage->vaddr +
-				       ((vm_offset_t)(bpage->datavaddr) & PAGE_MASK)),
+				bcopy((void *)bpage->vaddr,
 				      (void *)bpage->datavaddr,
 				      bpage->datacount);
 				bpage = STAILQ_NEXT(bpage, links);
@@ -1151,7 +1149,7 @@
 	bpage->datavaddr = vaddr;
 	bpage->datacount = size;
 	STAILQ_INSERT_TAIL(&(map->bpages), bpage, links);
-	return (bpage->busaddr + ((vm_offset_t)vaddr & PAGE_MASK));
+	return (bpage->busaddr);
 }
 
 static void