diff -rN -u -p old-xen-64-4/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h new-xen-64-4/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h --- old-xen-64-4/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h 2005-05-24 17:34:54.000000000 +0000 +++ new-xen-64-4/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/dma-mapping.h 2005-06-03 06:40:04.000000000 +0000 @@ -39,11 +39,11 @@ static inline dma_addr_t dma_map_single( 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; }