Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv23524/include/asm-mips64
Modified Files:
pci.h
Log Message:
Sync with OSS 2.4.14.
Index: pci.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/pci.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pci.h 2001/11/06 02:57:38 1.5
+++ pci.h 2001/11/06 09:10:22 1.6
@@ -8,6 +8,7 @@
#include <linux/config.h>
#include <linux/types.h>
+#include <asm/io.h> /* for virt_to_bus() */
#ifdef __KERNEL__
@@ -133,17 +134,14 @@
unsigned long offset, size_t size,
int direction)
{
- unsigned long addr;
-
if (direction == PCI_DMA_NONE)
BUG();
- addr = (unsigned long) page_address(page);
#ifndef CONFIG_COHERENT_IO
- dma_cache_wback_inv(addr, size);
+ dma_cache_wback_inv((unsigned long) page_address(page), size);
#endif
- return virt_to_bus((void *)addr);
+ return page_to_bus(page);
}
static inline void pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address,
|
