Merge "cma: Make the default CMA region not reserved by default"

drivers/base/dma-contiguous.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@ void __init dma_contiguous_reserve(phys_addr_t limit)
		(unsigned long)sel_size / SZ_1M);

		if (dma_contiguous_reserve_area(sel_size, &base, limit, NULL,
		CMA_RESERVE_AREA, false) == 0)
		CMA_RESERVE_AREA ? 0 : 1, false) == 0)
		dma_contiguous_def_base = base;
		}
		#ifdef CONFIG_OF