0054-of-only-scan-for-reserved-mem-when-fdt-present.patch 1018 B

123456789101112131415161718192021222324252627282930
  1. From 884ab569aec3a0847702dff0dad133bfb67e234c Mon Sep 17 00:00:00 2001
  2. From: Josh Cartwright <[email protected]>
  3. Date: Thu, 13 Mar 2014 16:36:36 -0500
  4. Subject: [PATCH 054/182] of: only scan for reserved mem when fdt present
  5. When the reserved memory patches hit -next, several legacy (non-DT) boot
  6. failures were detected and bisected down to that commit. There needs to
  7. be some sanity checking whether a DT is even present before parsing the
  8. reserved ranges.
  9. Reported-by: Kevin Hilman <[email protected]>
  10. Signed-off-by: Josh Cartwright <[email protected]>
  11. Tested-by: Kevin Hilman <[email protected]>
  12. Signed-off-by: Grant Likely <[email protected]>
  13. ---
  14. drivers/of/fdt.c | 3 +++
  15. 1 file changed, 3 insertions(+)
  16. --- a/drivers/of/fdt.c
  17. +++ b/drivers/of/fdt.c
  18. @@ -557,6 +557,9 @@ static int __init __fdt_scan_reserved_me
  19. */
  20. void __init early_init_fdt_scan_reserved_mem(void)
  21. {
  22. + if (!initial_boot_params)
  23. + return;
  24. +
  25. of_scan_flat_dt(__fdt_scan_reserved_mem, NULL);
  26. fdt_init_reserved_mem();
  27. }