[Xen-changelog] [xen-unstable] [IA64] swiotlb clash fix

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 73cdbd909a8d457cbaf8c74682157ad569cacd1b
# Parent  b55bbf6d4e8903d941cdd10e4ddc8eff7c7b9ff3
[IA64] swiotlb clash fix

Do not define dma_supported to platform_dma_supported when building
the Xen kernel. This happend to work for DIG builds because the
swiotlb.c version of dma_supported compiles to identical code as
arch/i386/kernel/pci-dma-xen.c so the linker didn't complain.

Signed-off-by: Jes Sorensen <jes@xxxxxxx>
---
 linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h |    2 ++
 1 files changed, 2 insertions(+)

diff -r b55bbf6d4e89 -r 73cdbd909a8d 
linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h       Tue Sep 12 
11:36:39 2006 -0600
+++ b/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h       Tue Sep 12 
11:42:27 2006 -0600
@@ -84,7 +84,9 @@ dma_sync_sg_for_device(struct device *de
 #define dma_sync_single_range_for_device(dev, dma_handle, offset, size, dir)   
\
        dma_sync_single_for_device(dev, dma_handle, size, dir)
 
+#ifndef CONFIG_XEN
 #define dma_supported          platform_dma_supported
+#endif
 
 static inline int
 dma_set_mask (struct device *dev, u64 mask)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog