Commit 7142392d authored Nov 20, 2015 by Suzuki K. Poulose Committed by Catalin Marinas Nov 25, 2015

arm64: early_alloc: Fix check for allocation failure



In early_alloc we check if the memblock_alloc failed by checking
the virtual address of the result, which will never fail. This patch
fixes it to check the actual result for failure.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Suzuki K. Poulose <suzuki.poulose@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

parent 1ec21837

arch/arm64/mm/mmu.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -64,8 +64,12 @@ EXPORT_SYMBOL(phys_mem_access_prot);

		static void __init *early_alloc(unsigned long sz)
		{
		void *ptr = __va(memblock_alloc(sz, sz));
		BUG_ON(!ptr);
		phys_addr_t phys;
		void *ptr;

		phys = memblock_alloc(sz, sz);
		BUG_ON(!phys);
		ptr = __va(phys);
		memset(ptr, 0, sz);
		return ptr;
		}