diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-23 13:16:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-23 13:16:35 +0100 |
| commit | a4121f52920d3588e475336bf076915899e51509 (patch) | |
| tree | e572b81041b1fc9f444c527ef12110875a98f57e /arch/arm64/mm/init.c | |
| parent | f321441306765b616f594c2a6bacbac8b5098712 (diff) | |
| parent | de06786c493930f7e82e90c77fa71af64166623d (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/arm64-misc' into linux-linaro-lsk-v3.14lsk-v3.14-preview-14.07
Diffstat (limited to 'arch/arm64/mm/init.c')
| -rw-r--r-- | arch/arm64/mm/init.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 88627c450a6c..c872988940db 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -128,20 +128,16 @@ void __init arm64_memblock_init(void) { u64 *reserve_map, base, size; - /* Register the kernel text, kernel data and initrd with memblock */ + /* + * Register the kernel text, kernel data, initrd, and initial + * pagetables with memblock. + */ memblock_reserve(__pa(_text), _end - _text); #ifdef CONFIG_BLK_DEV_INITRD if (initrd_start) memblock_reserve(__virt_to_phys(initrd_start), initrd_end - initrd_start); #endif - /* - * Reserve the page tables. These are already in use, - * and can only be in node 0. - */ - memblock_reserve(__pa(swapper_pg_dir), SWAPPER_DIR_SIZE); - memblock_reserve(__pa(idmap_pg_dir), IDMAP_DIR_SIZE); - /* Reserve the dtb region */ memblock_reserve(virt_to_phys(initial_boot_params), be32_to_cpu(initial_boot_params->totalsize)); |