[PATCH] um: Fix order of dtb unflatten/early init

From: Vincent Whitchurch
Date: Wed Jan 19 2022 - 04:30:17 EST


Scan the tree for reserved memory before unflattening it. As Rob
Herring said:
| These should be reversed. early_init_fdt_scan_reserved_mem() works on
| the flat tree. Reserved memory needs to be reserved before
| unflatten_device_tree() starts allocating memory. Though I imagine that
| doesn't really matter for UML.

Suggested-by: Rob Herring <robh@xxxxxxxxxx>
Link: https://lore.kernel.org/lkml/YeF%2FVbxo6fAt0WLp@xxxxxxxxxxxxxxxxxx/
Signed-off-by: Vincent Whitchurch <vincent.whitchurch@xxxxxxxx>
---
arch/um/kernel/dtb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/um/kernel/dtb.c b/arch/um/kernel/dtb.c
index ca69d72025f3..484141b06938 100644
--- a/arch/um/kernel/dtb.c
+++ b/arch/um/kernel/dtb.c
@@ -25,8 +25,8 @@ void uml_dtb_init(void)
return;
}

- unflatten_device_tree();
early_init_fdt_scan_reserved_mem();
+ unflatten_device_tree();
}

static int __init uml_dtb_setup(char *line, int *add)
--
2.34.1