From 1756dedada2549166ad3fef487ca778795a7dca6 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 6 Jul 2021 20:10:09 +0100 Subject: [PATCH] Revert "ANDROID: Export functions to be used with dma_map_ops in modules" This reverts commit cdc9f6ef946f3c17b048b3ee9e36aa0bbc12d712. These are not present in android12-5.10's XML files. Change-Id: Iefa9a4f34a6750da9758194a6542a624e748ff7f Signed-off-by: Lee Jones --- kernel/dma/direct.c | 3 --- kernel/dma/ops_helpers.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 3f51cfdc1d1a..f737e3347059 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -43,7 +43,6 @@ u64 dma_direct_get_required_mask(struct device *dev) return (1ULL << (fls64(max_dma) - 1)) * 2 - 1; } -EXPORT_SYMBOL_GPL(dma_direct_get_required_mask); static gfp_t dma_direct_optimal_gfp_mask(struct device *dev, u64 dma_mask, u64 *phys_limit) @@ -314,7 +313,6 @@ out_free_pages: dma_free_contiguous(dev, page, size); return NULL; } -EXPORT_SYMBOL_GPL(dma_direct_alloc); void dma_direct_free_pages(struct device *dev, size_t size, struct page *page, dma_addr_t dma_addr, @@ -333,7 +331,6 @@ void dma_direct_free_pages(struct device *dev, size_t size, dma_free_contiguous(dev, page, size); } -EXPORT_SYMBOL_GPL(dma_direct_free); #if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE) || \ defined(CONFIG_SWIOTLB) diff --git a/kernel/dma/ops_helpers.c b/kernel/dma/ops_helpers.c index 1c094513dc9e..910ae69cae77 100644 --- a/kernel/dma/ops_helpers.c +++ b/kernel/dma/ops_helpers.c @@ -20,7 +20,6 @@ int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, sg_set_page(sgt->sgl, page, PAGE_ALIGN(size), 0); return ret; } -EXPORT_SYMBOL_GPL(dma_common_get_sgtable); /* * Create userspace mapping for the DMA-coherent memory. @@ -50,7 +49,6 @@ int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, return -ENXIO; #endif /* CONFIG_MMU */ } -EXPORT_SYMBOL_GPL(dma_common_mmap); struct page *dma_common_alloc_pages(struct device *dev, size_t size, dma_addr_t *dma_handle, enum dma_data_direction dir, gfp_t gfp)