diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-12 14:41:03 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-12 14:41:03 +0100 |
| commit | 6660800fb7fd0f66faecb3c550fe59709220ade5 (patch) | |
| tree | 19f95c0579bc13ba8c1d326e5058330e2fd14d63 /arch/arm/kernel/setup.c | |
| parent | Merge branches 'misc' and 'misc-rc6' into for-linus (diff) | |
| parent | Merge tag 'arm32-efi-for-v4.5' of git://git.linaro.org/people/ard.biesheuvel/... (diff) | |
| download | linux-6660800fb7fd0f66faecb3c550fe59709220ade5.tar.xz linux-6660800fb7fd0f66faecb3c550fe59709220ade5.zip | |
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index e07f567487cd..7d0cba6f1cc5 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -7,6 +7,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/efi.h> #include <linux/export.h> #include <linux/kernel.h> #include <linux/stddef.h> @@ -37,7 +38,9 @@ #include <asm/cp15.h> #include <asm/cpu.h> #include <asm/cputype.h> +#include <asm/efi.h> #include <asm/elf.h> +#include <asm/early_ioremap.h> #include <asm/fixmap.h> #include <asm/procinfo.h> #include <asm/psci.h> @@ -1023,8 +1026,8 @@ void __init setup_arch(char **cmdline_p) strlcpy(cmd_line, boot_command_line, COMMAND_LINE_SIZE); *cmdline_p = cmd_line; - if (IS_ENABLED(CONFIG_FIX_EARLYCON_MEM)) - early_fixmap_init(); + early_fixmap_init(); + early_ioremap_init(); parse_early_param(); @@ -1032,9 +1035,12 @@ void __init setup_arch(char **cmdline_p) early_paging_init(mdesc); #endif setup_dma_zone(mdesc); + efi_init(); sanity_check_meminfo(); arm_memblock_init(mdesc); + early_ioremap_reset(); + paging_init(mdesc); request_standard_resources(mdesc); |