change alloc_pages name in dma_map_ops to avoid name conflicts

After redefining alloc_pages, all uses of that name are being replaced.
Change the conflicting names to prevent preprocessor from replacing them
when it's not intended.

Link: https://lkml.kernel.org/r/20240321163705.3067592-18-surenb@google.com
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Tested-by: Kees Cook <keescook@chromium.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Alex Gaynor <alex.gaynor@gmail.com>
Cc: Alice Ryhl <aliceryhl@google.com>
Cc: Andreas Hindborg <a.hindborg@samsung.com>
Cc: Benno Lossin <benno.lossin@proton.me>
Cc: "Björn Roy Baron" <bjorn3_gh@protonmail.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Dennis Zhou <dennis@kernel.org>
Cc: Gary Guo <gary@garyguo.net>
Cc: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Pasha Tatashin <pasha.tatashin@soleen.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Wedson Almeida Filho <wedsonaf@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index c81183935e97070b3e8cac9f6a24bbd09cf639ed..7fcf3e9b7103051bf3ee06424231a05fad37c832 100644 (file)
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -929,7 +929,7 @@ const struct dma_map_ops alpha_pci_ops = {
        .dma_supported          = alpha_pci_supported,
        .mmap                   = dma_common_mmap,
        .get_sgtable            = dma_common_get_sgtable,
-       .alloc_pages            = dma_common_alloc_pages,
+       .alloc_pages_op         = dma_common_alloc_pages,
        .free_pages             = dma_common_free_pages,
 };
 EXPORT_SYMBOL(alpha_pci_ops);

diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c
index eabddb89d221fe8dcab6ea9a0170afaf666ef697..c97b089b99029d154d7acfeb8d6a579a20c232ff 100644 (file)
--- a/arch/mips/jazz/jazzdma.c
+++ b/arch/mips/jazz/jazzdma.c
@@ -617,7 +617,7 @@ const struct dma_map_ops jazz_dma_ops = {
        .sync_sg_for_device     = jazz_dma_sync_sg_for_device,
        .mmap                   = dma_common_mmap,
        .get_sgtable            = dma_common_get_sgtable,
-       .alloc_pages            = dma_common_alloc_pages,
+       .alloc_pages_op         = dma_common_alloc_pages,
        .free_pages             = dma_common_free_pages,
 };
 EXPORT_SYMBOL(jazz_dma_ops);

diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c
index 8920862ffd7916ef3afcde6714a1676ae6a1f647..f0ae39e77e374143599d67702b4e9a8e12b60f1f 100644 (file)
--- a/arch/powerpc/kernel/dma-iommu.c
+++ b/arch/powerpc/kernel/dma-iommu.c
@@ -216,6 +216,6 @@ const struct dma_map_ops dma_iommu_ops = {
        .get_required_mask      = dma_iommu_get_required_mask,
        .mmap                   = dma_common_mmap,
        .get_sgtable            = dma_common_get_sgtable,
-       .alloc_pages            = dma_common_alloc_pages,
+       .alloc_pages_op         = dma_common_alloc_pages,
        .free_pages             = dma_common_free_pages,
 };

diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index d6b5f5ecd5152bddf6050ac63d1dc9b3bf34e61f..56dc6b29a3e7699a2695dfc23f0d07b50e6205a8 100644 (file)
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -695,7 +695,7 @@ static const struct dma_map_ops ps3_sb_dma_ops = {
        .unmap_page = ps3_unmap_page,
        .mmap = dma_common_mmap,
        .get_sgtable = dma_common_get_sgtable,
-       .alloc_pages = dma_common_alloc_pages,
+       .alloc_pages_op = dma_common_alloc_pages,
        .free_pages = dma_common_free_pages,
 };
 
@@ -709,7 +709,7 @@ static const struct dma_map_ops ps3_ioc0_dma_ops = {
        .unmap_page = ps3_unmap_page,
        .mmap = dma_common_mmap,
        .get_sgtable = dma_common_get_sgtable,
-       .alloc_pages = dma_common_alloc_pages,
+       .alloc_pages_op = dma_common_alloc_pages,
        .free_pages = dma_common_free_pages,
 };
 

diff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c
index 90ff85c879bfe9bbc602fbc146a50fa5d933424a..477c1d5e1737ba483163da8265823a12764c7153 100644 (file)
--- a/arch/powerpc/platforms/pseries/vio.c
+++ b/arch/powerpc/platforms/pseries/vio.c
@@ -611,7 +611,7 @@ static const struct dma_map_ops vio_dma_mapping_ops = {
        .get_required_mask = dma_iommu_get_required_mask,
        .mmap              = dma_common_mmap,
        .get_sgtable       = dma_common_get_sgtable,
-       .alloc_pages       = dma_common_alloc_pages,
+       .alloc_pages_op    = dma_common_alloc_pages,
        .free_pages        = dma_common_free_pages,
 };
 

diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
index 2ae98f754e5918872305deda753c951d0c7584c6..c884deca839b2ea544d1e03d056c3b758b0e9ee3 100644 (file)
--- a/arch/x86/kernel/amd_gart_64.c
+++ b/arch/x86/kernel/amd_gart_64.c
@@ -676,7 +676,7 @@ static const struct dma_map_ops gart_dma_ops = {
        .get_sgtable                    = dma_common_get_sgtable,
        .dma_supported                  = dma_direct_supported,
        .get_required_mask              = dma_direct_get_required_mask,
-       .alloc_pages                    = dma_direct_alloc_pages,
+       .alloc_pages_op                 = dma_direct_alloc_pages,
        .free_pages                     = dma_direct_free_pages,
 };
 

diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index e4cb26f6a9434e37b8a9e2da872bc80071229520..07d087eecc17c37df68884c0f93aa445d79a4aa3 100644 (file)
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -1723,7 +1723,7 @@ static const struct dma_map_ops iommu_dma_ops = {
        .flags                  = DMA_F_PCI_P2PDMA_SUPPORTED,
        .alloc                  = iommu_dma_alloc,
        .free                   = iommu_dma_free,
-       .alloc_pages            = dma_common_alloc_pages,
+       .alloc_pages_op         = dma_common_alloc_pages,
        .free_pages             = dma_common_free_pages,
        .alloc_noncontiguous    = iommu_dma_alloc_noncontiguous,
        .free_noncontiguous     = iommu_dma_free_noncontiguous,

diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 9ce0d20a6c581204bb4c10e4a11b10e03d3e17a2..feef537257d0570c0971cdecb18a9e2f475b59eb 100644 (file)
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1022,7 +1022,7 @@ static const struct dma_map_ops ccio_ops = {
        .map_sg =               ccio_map_sg,
        .unmap_sg =             ccio_unmap_sg,
        .get_sgtable =          dma_common_get_sgtable,
-       .alloc_pages =          dma_common_alloc_pages,
+       .alloc_pages_op =       dma_common_alloc_pages,
        .free_pages =           dma_common_free_pages,
 };
 

diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 784037837f65e0e439ec44663169678171073722..fc3863c09f83d358c9616731619c84c056b29d57 100644 (file)
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1090,7 +1090,7 @@ static const struct dma_map_ops sba_ops = {
        .map_sg =               sba_map_sg,
        .unmap_sg =             sba_unmap_sg,
        .get_sgtable =          dma_common_get_sgtable,
-       .alloc_pages =          dma_common_alloc_pages,
+       .alloc_pages_op =       dma_common_alloc_pages,
        .free_pages =           dma_common_free_pages,
 };
 

diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c
index 76f6f26265a3b8ba4b7a192bd6d4cdf0ba867d10..29257d2639dbf0178aa792151f39628a8b180731 100644 (file)
--- a/drivers/xen/grant-dma-ops.c
+++ b/drivers/xen/grant-dma-ops.c
@@ -282,7 +282,7 @@ static int xen_grant_dma_supported(struct device *dev, u64 mask)
 static const struct dma_map_ops xen_grant_dma_ops = {
        .alloc = xen_grant_dma_alloc,
        .free = xen_grant_dma_free,
-       .alloc_pages = xen_grant_dma_alloc_pages,
+       .alloc_pages_op = xen_grant_dma_alloc_pages,
        .free_pages = xen_grant_dma_free_pages,
        .mmap = dma_common_mmap,
        .get_sgtable = dma_common_get_sgtable,

diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 0e6c6c25d154f5e2e439aa261397298fb0ac8118..1c4ef5111651d65b34cd23dae1693c7d1d29a726 100644 (file)
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -403,7 +403,7 @@ const struct dma_map_ops xen_swiotlb_dma_ops = {
        .dma_supported = xen_swiotlb_dma_supported,
        .mmap = dma_common_mmap,
        .get_sgtable = dma_common_get_sgtable,
-       .alloc_pages = dma_common_alloc_pages,
+       .alloc_pages_op = dma_common_alloc_pages,
        .free_pages = dma_common_free_pages,
        .max_mapping_size = swiotlb_max_mapping_size,
 };

diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h
index 4abc60f04209281bf8af6905c4ec3d3bb6b531b5..9ee319851b5f635834a859ed687f32495873ef2c 100644 (file)
--- a/include/linux/dma-map-ops.h
+++ b/include/linux/dma-map-ops.h
@@ -29,7 +29,7 @@ struct dma_map_ops {
                        unsigned long attrs);
        void (*free)(struct device *dev, size_t size, void *vaddr,
                        dma_addr_t dma_handle, unsigned long attrs);
-       struct page *(*alloc_pages)(struct device *dev, size_t size,
+       struct page *(*alloc_pages_op)(struct device *dev, size_t size,
                        dma_addr_t *dma_handle, enum dma_data_direction dir,
                        gfp_t gfp);
        void (*free_pages)(struct device *dev, size_t size, struct page *vaddr,

diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index 58db8fd70471a197c3fcd1d745b4fbc864b6634c..5e2d51e1cdf694ef81fc3b8b4c147baa83fe03d6 100644 (file)
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -570,9 +570,9 @@ static struct page *__dma_alloc_pages(struct device *dev, size_t size,
        size = PAGE_ALIGN(size);
        if (dma_alloc_direct(dev, ops))
                return dma_direct_alloc_pages(dev, size, dma_handle, dir, gfp);
-       if (!ops->alloc_pages)
+       if (!ops->alloc_pages_op)
                return NULL;
-       return ops->alloc_pages(dev, size, dma_handle, dir, gfp);
+       return ops->alloc_pages_op(dev, size, dma_handle, dir, gfp);
 }
 
 struct page *dma_alloc_pages(struct device *dev, size_t size,