diff options
| author | Reed Riley <reed@riley.engineer> | 2024-04-15 21:08:13 -0700 |
|---|---|---|
| committer | Reed Riley <reed@riley.engineer> | 2024-04-15 21:08:13 -0700 |
| commit | e5e8f203d77f90d1af8ebfd794eb1593582b85cc (patch) | |
| tree | 4b247a45e411ea62d5af495eec775d3d48c40676 /kernel/dma/mapping.c | |
| parent | 6432d7745c1d0eba610fed85a8a6bac1864e858d (diff) | |
| parent | 72cfb036b00a2c9f59a5d6ff1bc2d039ffb67490 (diff) | |
Merge branch 'memalloc_prof_v6' of https://github.com/surenbaghdasaryan/linux
Diffstat (limited to 'kernel/dma/mapping.c')
| -rw-r--r-- | kernel/dma/mapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 58db8fd70471..5e2d51e1cdf6 100644 --- 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, |