Skip to content

Commit 39508aa

Browse files
vwaxrichardweinberger
authored andcommitted
um: Fix order of dtb unflatten/early init
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@kernel.org> Link: https://lore.kernel.org/lkml/YeF%2FVbxo6fAt0WLp@robh.at.kernel.org/ Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com> Signed-off-by: Richard Weinberger <richard@nod.at>
1 parent e3a33af commit 39508aa

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/um/kernel/dtb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ void uml_dtb_init(void)
2525
return;
2626
}
2727

28-
unflatten_device_tree();
2928
early_init_fdt_scan_reserved_mem();
29+
unflatten_device_tree();
3030
}
3131

3232
static int __init uml_dtb_setup(char *line, int *add)

0 commit comments

Comments
 (0)