diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-24 23:03:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-24 23:03:21 +0100 |
| commit | c69294e957dd173809ec7815231e6aff6d5c2d83 (patch) | |
| tree | ce9801ec11db70553ed55a4c58eb95a22af6cefc /arch/arm64/kernel/setup.c | |
| parent | bcddae4453f74e9d1dbc8db78c5c9bc552c600cb (diff) | |
| parent | 2edcb9f57bdaef4d4dc3f0f13c3a2b320b07fdf7 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-efi' into linux-linaro-lsk
Conflicts:
arch/arm64/kernel/Makefile
arch/arm64/kernel/head.S
Diffstat (limited to 'arch/arm64/kernel/setup.c')
| -rw-r--r-- | arch/arm64/kernel/setup.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 9bafffe12689..e87b5fd07b8c 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -41,6 +41,7 @@ #include <linux/memblock.h> #include <linux/of_fdt.h> #include <linux/of_platform.h> +#include <linux/efi.h> #include <asm/fixmap.h> #include <asm/cputype.h> @@ -55,6 +56,7 @@ #include <asm/traps.h> #include <asm/memblock.h> #include <asm/psci.h> +#include <asm/efi.h> unsigned int processor_id; EXPORT_SYMBOL(processor_id); @@ -417,11 +419,14 @@ void __init setup_arch(char **cmdline_p) parse_early_param(); + efi_init(); arm64_memblock_init(); paging_init(); request_standard_resources(); + efi_idmap_init(); + unflatten_device_tree(); psci_init(); |