diff options
| author | Suren Baghdasaryan <surenb@google.com> | 2022-07-31 11:06:24 -0700 |
|---|---|---|
| committer | Suren Baghdasaryan <surenb@google.com> | 2024-02-11 10:45:16 -0800 |
| commit | 855545e69a31ec41c9288bc3a6fea37fb75e286e (patch) | |
| tree | b9b17db1041c573ffef9573c387925c534fbc1ae /include/linux/dma-map-ops.h | |
| parent | 39e048af942f53bfe8a41cc0a5830885fd882eae (diff) | |
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.
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Diffstat (limited to 'include/linux/dma-map-ops.h')
| -rw-r--r-- | include/linux/dma-map-ops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h index 4abc60f04209..9ee319851b5f 100644 --- 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, |