diff options
| author | Rob Herring <robh@kernel.org> | 2014-04-29 13:16:50 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-04-30 00:59:04 -0500 |
| commit | edba274cdeaa84e2cf8a9a34fe7583b0e01edbab (patch) | |
| tree | 401522c28e28f25bd6f7f93a25e4452eabe8065e /arch/powerpc/kernel/prom.c | |
| parent | afb46f7996e91aeb36e07bc92cf96e8045bec00e (diff) | |
| download | lwn-edba274cdeaa84e2cf8a9a34fe7583b0e01edbab.tar.gz lwn-edba274cdeaa84e2cf8a9a34fe7583b0e01edbab.zip | |
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>
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 668aa4791fd7..d65754935652 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -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) |