Commit 8a2f1187 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Andrew Morton
Browse files

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: default avatarSuren Baghdasaryan <surenb@google.com>
Tested-by: default avatarKees 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent ccdabb1d

arch/alpha/kernel/pci_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/mips/jazz/jazzdma.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/kernel/dma-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

arch/powerpc/platforms/ps3/system-bus.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

};

arch/powerpc/platforms/pseries/vio.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};