Commit edba274c authored Apr 29, 2014 by Rob Herring

powerpc: fix skipping call to early_init_fdt_scan_reserved_mem

The call to early_init_fdt_scan_reserved_mem will be skipped if
reserved-ranges is not found. Move the call earlier so that it is called
unconditionally.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@lists.ozlabs.org
Tested-by: Stephen Chivers <schivers@csc.com>

parent afb46f79

arch/powerpc/kernel/prom.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -567,6 +567,8 @@ static void __init early_reserve_mem_dt(void)
		unsigned long i, len, dt_root;
		const __be32 *prop;

		early_init_fdt_scan_reserved_mem();

		dt_root = of_get_flat_dt_root();

		prop = of_get_flat_dt_prop(dt_root, "reserved-ranges", &len);
		@@ -589,8 +591,6 @@ static void __init early_reserve_mem_dt(void)
		memblock_reserve(base, size);
		}
		}

		early_init_fdt_scan_reserved_mem();
		}

		static void __init early_reserve_mem(void)