diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-11 08:49:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-11 08:49:25 -0700 |
| commit | a0f8361c3ce4cf706608edb81c4334783cb093cf (patch) | |
| tree | bbff500dba54b774f1d21eafdb5b2dc0373db8e5 /kernel | |
| parent | Merge tag 'net-6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| parent | dma-contiguous: hornor the cma address limit setup by user (diff) | |
| download | linux-a0f8361c3ce4cf706608edb81c4334783cb093cf.tar.gz linux-a0f8361c3ce4cf706608edb81c4334783cb093cf.zip | |
Merge tag 'dma-mapping-6.16-2025-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux
Pull dma-mapping fix from Marek Szyprowski:
- small fix relevant to arm64 server and custom CMA configuration (Feng
Tang)
* tag 'dma-mapping-6.16-2025-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
dma-contiguous: hornor the cma address limit setup by user
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/contiguous.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index 8df0dfaaca18..67af8a55185d 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -222,7 +222,10 @@ void __init dma_contiguous_reserve(phys_addr_t limit) if (size_cmdline != -1) { selected_size = size_cmdline; selected_base = base_cmdline; - selected_limit = min_not_zero(limit_cmdline, limit); + + /* Hornor the user setup dma address limit */ + selected_limit = limit_cmdline ?: limit; + if (base_cmdline + size_cmdline == limit_cmdline) fixed = true; } else { |