diff options
| author | David Daney <david.daney@cavium.com> | 2016-04-08 22:50:26 (GMT) |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2016-04-15 17:06:08 (GMT) |
| commit | 3194ac6e66cc7a00c1fa9fecf33a7c376b489497 (patch) | |
| tree | 2820041003af28ce17b7d07ca23e25ab459a681e /arch/arm64/mm | |
| parent | 298535c00a2cbcd59e38f8f1c0c9ae7b9911e946 (diff) | |
| download | linux-3194ac6e66cc7a00c1fa9fecf33a7c376b489497.tar.xz | |
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/mm')
| -rw-r--r-- | arch/arm64/mm/mm.h | 1 | ||||
| -rw-r--r-- | arch/arm64/mm/mmu.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/mm/mm.h b/arch/arm64/mm/mm.h index ef47d99..71fe989 100644 --- a/arch/arm64/mm/mm.h +++ b/arch/arm64/mm/mm.h @@ -1,3 +1,2 @@ -extern void __init bootmem_init(void); void fixup_init(void); diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index dbad533..0f85a46 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -564,8 +564,6 @@ void __init paging_init(void) */ memblock_free(__pa(swapper_pg_dir) + PAGE_SIZE, SWAPPER_DIR_SIZE - PAGE_SIZE); - - bootmem_init(); } /* |