提交 2040b527 编写于 作者: J Josh Cartwright 提交者: Grant Likely

of: only scan for reserved mem when fdt present

When the reserved memory patches hit -next, several legacy (non-DT) boot
failures were detected and bisected down to that commit. There needs to
be some sanity checking whether a DT is even present before parsing the
reserved ranges.
Reported-by: NKevin Hilman <khilman@linaro.org>
Signed-off-by: NJosh Cartwright <joshc@codeaurora.org>
Tested-by: NKevin Hilman <khilman@linaro.org>
Signed-off-by: NGrant Likely <grant.likely@linaro.org>
上级 708b7eef
...@@ -557,6 +557,9 @@ static int __init __fdt_scan_reserved_mem(unsigned long node, const char *uname, ...@@ -557,6 +557,9 @@ static int __init __fdt_scan_reserved_mem(unsigned long node, const char *uname,
*/ */
void __init early_init_fdt_scan_reserved_mem(void) void __init early_init_fdt_scan_reserved_mem(void)
{ {
if (!initial_boot_params)
return;
of_scan_flat_dt(__fdt_scan_reserved_mem, NULL); of_scan_flat_dt(__fdt_scan_reserved_mem, NULL);
fdt_init_reserved_mem(); fdt_init_reserved_mem();
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册