diff options
| author | David Daney <david.daney@cavium.com> | 2016-04-08 15:50:26 -0700 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2016-04-15 18:06:08 +0100 |
| commit | 3194ac6e66cc7a00c1fa9fecf33a7c376b489497 (patch) | |
| tree | 2820041003af28ce17b7d07ca23e25ab459a681e /arch/arm64/kernel/setup.c | |
| parent | 298535c00a2cbcd59e38f8f1c0c9ae7b9911e946 (diff) | |
| download | lwn-3194ac6e66cc7a00c1fa9fecf33a7c376b489497.tar.gz lwn-3194ac6e66cc7a00c1fa9fecf33a7c376b489497.zip | |
arm64: Move unflatten_device_tree() call earlier.
In order to extract NUMA information from the device tree, we need to
have the tree in its unflattened form.
Move the call to bootmem_init() in the tail of paging_init() into
setup_arch, and adjust header files so that its declaration is
visible.
Move the unflatten_device_tree() call between the calls to
paging_init() and bootmem_init(). Follow on patches add NUMA handling
to bootmem_init().
Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/setup.c')
| -rw-r--r-- | arch/arm64/kernel/setup.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 7b85b1d6a6fb..432bc7f1dc45 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -265,18 +265,22 @@ void __init setup_arch(char **cmdline_p) paging_init(); + if (acpi_disabled) + unflatten_device_tree(); + + bootmem_init(); + kasan_init(); request_standard_resources(); early_ioremap_reset(); - if (acpi_disabled) { - unflatten_device_tree(); + if (acpi_disabled) psci_dt_init(); - } else { + else psci_acpi_init(); - } + xen_early_init(); cpu_read_bootcpu_ops(); |