Skip to content

Commit

Permalink
powerpc: fix skipping call to early_init_fdt_scan_reserved_mem
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rob Herring committed Apr 30, 2014
1 parent afb46f7 commit edba274
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/kernel/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
Expand Down

0 comments on commit edba274

Please sign in to comment.