From 5ee6ae223b3f069d4cb126d42f8dec64f82cf0f1 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 3 Jun 2005 07:55:30 +0000 Subject: bitkeeper revision 1.1658 (42a00cf2Cgpej1px1OeZJMp9dbdX8g) IO DMA isn't bound by physical address, but it is by machine address. Signed-off-by: Scott Parish --- linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h index a646e3f863..8d4e666cf4 100644 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h @@ -39,11 +39,11 @@ static inline dma_addr_t dma_map_single(struct device *hwdev, void *ptr, if (direction == DMA_NONE) out_of_line_bug(); - addr = virt_to_phys(ptr); + addr = virt_to_machine(ptr); if ((addr+size) & ~*hwdev->dma_mask) out_of_line_bug(); - return phys_to_machine(addr); + return addr; } static inline void dma_unmap_single(struct device *hwdev, dma_addr_t dma_addr, -- cgit v1.2.3