# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID d44143d4479c6d7381c1215bf3c743c4ed820b5b
# Parent  18c831e344bf4020c2b7a10b8f3654f2791cbdfd
xenLinux/ia64 with dom0 vp model uses
linux-2.6-xen-sparse/arch/i386/kernel/pci-dma-xen.c.
But it has its own dma_map_page(), dma_declare_coheremnt_memory() and their
families. So those in pci-dma-xen.c are unnecessary. #ifdef out them.
PATCHNAME: pci-dma-xen-common

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 18c831e344bf -r d44143d4479c linux-2.6-xen-sparse/arch/i386/kernel/pci-dma-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/pci-dma-xen.c	Mon Apr 24 22:27:53 2006 +0900
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/pci-dma-xen.c	Mon Apr 24 22:27:54 2006 +0900
@@ -93,6 +93,7 @@ dma_unmap_sg(struct device *hwdev, struc
 }
 EXPORT_SYMBOL(dma_unmap_sg);
 
+#ifndef dma_map_page
 dma_addr_t
 dma_map_page(struct device *dev, struct page *page, unsigned long offset,
 	     size_t size, enum dma_data_direction direction)
@@ -122,6 +123,7 @@ dma_unmap_page(struct device *dev, dma_a
 		swiotlb_unmap_page(dev, dma_address, size, direction);
 }
 EXPORT_SYMBOL(dma_unmap_page);
+#endif /* dma_map_page */
 
 int
 dma_mapping_error(dma_addr_t dma_addr)
@@ -204,6 +206,7 @@ void dma_free_coherent(struct device *de
 }
 EXPORT_SYMBOL(dma_free_coherent);
 
+#ifdef ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
 int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
 				dma_addr_t device_addr, size_t size, int flags)
 {
@@ -280,6 +283,7 @@ void *dma_mark_declared_memory_occupied(
 	return mem->virt_base + (pos << PAGE_SHIFT);
 }
 EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
+#endif /* ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY */
 
 dma_addr_t
 dma_map_single(struct device *dev, void *ptr, size_t size,