Commit 39508aab authored by Vincent Whitchurch's avatar Vincent Whitchurch Committed by Richard Weinberger
Browse files

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: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/lkml/YeF%2FVbxo6fAt0WLp@robh.at.kernel.org/


Signed-off-by: default avatarVincent Whitchurch <vincent.whitchurch@axis.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent e3a33af8

arch/um/kernel/dtb.c

+1 −1
Original line number Diff line number Diff line
@@ -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)