The patch titled x86_64: Calgary - change _map_single, etc to static has been removed from the -mm tree. Its filename was x86_64-calgary-change-_map_single-etc-to-static.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: x86_64: Calgary - change _map_single, etc to static From: Yinghai Lu <yinghai.lu@xxxxxxx> there function are called via dma_ops->.., so change them to static Signed-off-by: Yinghai Lu <yinghai.lu@xxxxxxx> Signed-off-by: Muli Ben-Yehuda <muli@xxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86_64/kernel/pci-calgary.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/x86_64/kernel/pci-calgary.c~x86_64-calgary-change-_map_single-etc-to-static arch/x86_64/kernel/pci-calgary.c --- a/arch/x86_64/kernel/pci-calgary.c~x86_64-calgary-change-_map_single-etc-to-static +++ a/arch/x86_64/kernel/pci-calgary.c @@ -417,7 +417,7 @@ static int calgary_nontranslate_map_sg(s 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); @@ -462,7 +462,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; @@ -481,7 +481,7 @@ dma_addr_t calgary_map_single(struct dev 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); @@ -494,7 +494,7 @@ void calgary_unmap_single(struct device 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; _ Patches currently in -mm which might be from yinghai.lu@xxxxxxx are origin.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html