diff options
| author |   Vincent Whitchurch <vincent.whitchurch@axis.com> | 2022-01-19 10:29:34 +0100 |
|---|---|---|
| committer |   Richard Weinberger <richard@nod.at> | 2022-03-11 10:44:43 +0100 |
| commit | 39508aab4a66473b4ba7cce0dbe919f2fec7450a (patch) | |
| tree | ced3f2bf78c9d4c204188137ab372bfe23e20a0a /arch/um/kernel | |
| parent | um: fix and optimize xor select template for CONFIG64 and timetravel mode (diff) | |
| download | linux-dev-39508aab4a66473b4ba7cce0dbe919f2fec7450a.tar.xz linux-dev-39508aab4a66473b4ba7cce0dbe919f2fec7450a.zip | |
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>
Diffstat (limited to 'arch/um/kernel')
| -rw-r--r-- | arch/um/kernel/dtb.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |