diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-19 12:07:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-19 12:07:47 -0400 |
| commit | 7a5e87867e9fe043c3067a864124caf2b8e7fb99 (patch) | |
| tree | 6ff53a7e65dabc9f25d6e162e38176da4995a274 /arch/arm64 | |
| parent | 9f47112975fdc32e545e079f42a17bbd0be236fc (diff) | |
| parent | 5ac385d83525fb8924ef87c18a4dc49998366394 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes:
EFI fixes, a build fix, a page table dumping (debug) fix and a clang
build fix"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi/arm64: Fix fdt-related memory reservation
x86/mm: Apply the section attribute to the variable, not its type
x86/efi: Fixup GOT in all boot code paths
x86/efi: Only load initrd above 4g on second try
x86-64, ptdump: Mark espfix area only if existent
x86, irq: Fix build error caused by 9eabc99a635a77cbf09
Diffstat (limited to 'arch/arm64')
| -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) | |||
| 149 | memblock_reserve(__virt_to_phys(initrd_start), initrd_end - initrd_start); | 149 | memblock_reserve(__virt_to_phys(initrd_start), initrd_end - initrd_start); |
| 150 | #endif | 150 | #endif |
| 151 | 151 | ||
| 152 | if (!efi_enabled(EFI_MEMMAP)) | 152 | early_init_fdt_scan_reserved_mem(); |
| 153 | early_init_fdt_scan_reserved_mem(); | ||
| 154 | 153 | ||
| 155 | /* 4GB maximum for 32-bit only capable devices */ | 154 | /* 4GB maximum for 32-bit only capable devices */ |
| 156 | if (IS_ENABLED(CONFIG_ZONE_DMA)) | 155 | if (IS_ENABLED(CONFIG_ZONE_DMA)) |