Merge "of: alloc anywhere from memblock if range not specified" (541e2fbe) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/of/of_reserved_mem.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -33,11 +33,13 @@ int __init __weak early_init_dt_alloc_reserved_memory_arch(phys_addr_t size,
		phys_addr_t align, phys_addr_t start, phys_addr_t end, bool nomap,
		phys_addr_t *res_base)
		{
		phys_addr_t base;
		/*
		* We use __memblock_alloc_base() because memblock_alloc_base()
		* panic()s on allocation failure.
		*/
		phys_addr_t base = __memblock_alloc_base(size, align, end);
		end = !end ? MEMBLOCK_ALLOC_ANYWHERE : end;
		base = __memblock_alloc_base(size, align, end);
		if (!base)
		return -ENOMEM;