ia64/xen-unstable

changeset 5297:cc7982c93f34

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>
author kaf24@firebug.cl.cam.ac.uk
date Fri Jun 03 07:55:30 2005 +0000 (2005-06-03)
parents b0455190b578
children b3907ddefba4
files linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h	Fri Jun 03 01:34:53 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h	Fri Jun 03 07:55:30 2005 +0000
     1.3 @@ -39,11 +39,11 @@ static inline dma_addr_t dma_map_single(
     1.4  
     1.5  	if (direction == DMA_NONE)
     1.6  		out_of_line_bug();
     1.7 -	addr = virt_to_phys(ptr);
     1.8 +	addr = virt_to_machine(ptr);
     1.9  
    1.10  	if ((addr+size) & ~*hwdev->dma_mask)
    1.11  		out_of_line_bug();
    1.12 -	return phys_to_machine(addr);
    1.13 +	return addr;
    1.14  }
    1.15  
    1.16  static inline void dma_unmap_single(struct device *hwdev, dma_addr_t dma_addr,