diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-09-09 16:56:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-09-09 16:56:12 +0200 |
| commit | 5ac385d83525fb8924ef87c18a4dc49998366394 (patch) | |
| tree | 68748bd20b197309abeeea2698cd0ccffcd15717 /arch/arm64/mm/init.c | |
| parent | cc99535eb4049c730cac421d403d079593cb31ae (diff) | |
| parent | 0ceac9e094b065fe3fec19669740f338d3480498 (diff) | |
| download | linux-5ac385d83525fb8924ef87c18a4dc49998366394.tar.gz linux-5ac385d83525fb8924ef87c18a4dc49998366394.tar.bz2 linux-5ac385d83525fb8924ef87c18a4dc49998366394.zip | |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent
Pull EFI fixes from Matt Fleming:
* Fix early boot regression affecting x86 EFI boot stub when loading
initrds above 4GB - Yinghai Lu
* Relocate GOT entries in the x86 EFI boot stub now that we have
symbols with global visibility - Matt Fleming
* fdt memory reservation fix for arm64 - Mark Salter
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/mm/init.c')
| -rw-r--r-- | arch/arm64/mm/init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 5472c2401876..a83061f37e43 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -149,8 +149,7 @@ void __init arm64_memblock_init(void) memblock_reserve(__virt_to_phys(initrd_start), initrd_end - initrd_start); #endif - if (!efi_enabled(EFI_MEMMAP)) - early_init_fdt_scan_reserved_mem(); + early_init_fdt_scan_reserved_mem(); /* 4GB maximum for 32-bit only capable devices */ if (IS_ENABLED(CONFIG_ZONE_DMA)) |