From: Yinghai Lu Date: Sat, 21 Jul 2007 15:11:05 +0000 (+0200) Subject: x86_64: Calgary - change _map_single, etc to static X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0b11e1c6a604014283af70e27e0f32971407fd6d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git x86_64: Calgary - change _map_single, etc to static there function are called via dma_ops->.., so change them to static Signed-off-by: Yinghai Lu Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c index fa50d6a1ce46..d10fee8c2418 100644 --- a/arch/x86_64/kernel/pci-calgary.c +++ b/arch/x86_64/kernel/pci-calgary.c @@ -429,7 +429,7 @@ static int calgary_nontranslate_map_sg(struct device* dev, return nelems; } -int calgary_map_sg(struct device *dev, struct scatterlist *sg, +static int calgary_map_sg(struct device *dev, struct scatterlist *sg, int nelems, int direction) { struct iommu_table *tbl = find_iommu_table(dev); @@ -474,7 +474,7 @@ error: return 0; } -dma_addr_t calgary_map_single(struct device *dev, void *vaddr, +static dma_addr_t calgary_map_single(struct device *dev, void *vaddr, size_t size, int direction) { dma_addr_t dma_handle = bad_dma_address; @@ -493,7 +493,7 @@ dma_addr_t calgary_map_single(struct device *dev, void *vaddr, return dma_handle; } -void calgary_unmap_single(struct device *dev, dma_addr_t dma_handle, +static void calgary_unmap_single(struct device *dev, dma_addr_t dma_handle, size_t size, int direction) { struct iommu_table *tbl = find_iommu_table(dev); @@ -506,7 +506,7 @@ void calgary_unmap_single(struct device *dev, dma_addr_t dma_handle, iommu_free(tbl, dma_handle, npages); } -void* calgary_alloc_coherent(struct device *dev, size_t size, +static void* calgary_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { void *ret = NULL;