Commit a0f8361c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-6.16-2025-07-11' of... 

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
parents bc9ff192 aa807b9f

kernel/dma/contiguous.c

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