Commit edba274c authored by Rob Herring's avatar 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: default avatarRob 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: default avatarStephen Chivers <schivers@csc.com>
parent afb46f79
...@@ -567,6 +567,8 @@ static void __init early_reserve_mem_dt(void) ...@@ -567,6 +567,8 @@ static void __init early_reserve_mem_dt(void)
unsigned long i, len, dt_root; unsigned long i, len, dt_root;
const __be32 *prop; const __be32 *prop;
early_init_fdt_scan_reserved_mem();
dt_root = of_get_flat_dt_root(); dt_root = of_get_flat_dt_root();
prop = of_get_flat_dt_prop(dt_root, "reserved-ranges", &len); prop = of_get_flat_dt_prop(dt_root, "reserved-ranges", &len);
...@@ -589,8 +591,6 @@ static void __init early_reserve_mem_dt(void) ...@@ -589,8 +591,6 @@ static void __init early_reserve_mem_dt(void)
memblock_reserve(base, size); memblock_reserve(base, size);
} }
} }
early_init_fdt_scan_reserved_mem();
} }
static void __init early_reserve_mem(void) static void __init early_reserve_mem(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment