Skip to content

Commit a0f8361

Browse files
committed
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
2 parents bc9ff19 + aa807b9 commit a0f8361

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

kernel/dma/contiguous.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,10 @@ void __init dma_contiguous_reserve(phys_addr_t limit)
222222
if (size_cmdline != -1) {
223223
selected_size = size_cmdline;
224224
selected_base = base_cmdline;
225-
selected_limit = min_not_zero(limit_cmdline, limit);
225+
226+
/* Hornor the user setup dma address limit */
227+
selected_limit = limit_cmdline ?: limit;
228+
226229
if (base_cmdline + size_cmdline == limit_cmdline)
227230
fixed = true;
228231
} else {

0 commit comments

Comments
 (0)