diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-03 07:55:30 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-03 07:55:30 +0000 |
| commit | 5ee6ae223b3f069d4cb126d42f8dec64f82cf0f1 (patch) | |
| tree | 0372bee521671016b578d4b1d5581b617ce59641 | |
| parent | 67470d107149ad30496c8bfc41ca7143f0ffceb7 (diff) | |
| download | xen-5ee6ae223b3f069d4cb126d42f8dec64f82cf0f1.tar.gz xen-5ee6ae223b3f069d4cb126d42f8dec64f82cf0f1.tar.bz2 xen-5ee6ae223b3f069d4cb126d42f8dec64f82cf0f1.zip | |
bitkeeper revision 1.1658 (42a00cf2Cgpej1px1OeZJMp9dbdX8g)
IO DMA isn't bound by physical address, but it is by machine address.
Signed-off-by: Scott Parish <srparish@us.ibm.com>
| -rw-r--r-- | linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h | 4 |
1 files 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, |