diff options
author | Shannon Zhao <shannon.zhao@linaro.org> | 2016-04-07 08:03:28 -0400 |
---|---|---|
committer | David Vrabel <david.vrabel@citrix.com> | 2016-07-06 05:34:45 -0400 |
commit | 9b08aaa3199a4dffca73c7cdec813b483b5b2d3b (patch) | |
tree | 4270284902d30207db29261bde3079b9b9f16241 /arch/arm64/kernel/setup.c | |
parent | d22cbe651f6573f66c649d5ba91fb87552bbb297 (diff) |
ARM: XEN: Move xen_early_init() before efi_init()
Move xen_early_init() before efi_init(), then when calling efi_init()
could initialize Xen specific UEFI.
Check if it runs on Xen hypervisor through the flat dts.
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Julien Grall <julien.grall@arm.com>
Tested-by: Julien Grall <julien.grall@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/setup.c')
-rw-r--r-- | arch/arm64/kernel/setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 3279defabaa2..feab2eebb283 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c | |||
@@ -257,6 +257,7 @@ void __init setup_arch(char **cmdline_p) | |||
257 | */ | 257 | */ |
258 | cpu_uninstall_idmap(); | 258 | cpu_uninstall_idmap(); |
259 | 259 | ||
260 | xen_early_init(); | ||
260 | efi_init(); | 261 | efi_init(); |
261 | arm64_memblock_init(); | 262 | arm64_memblock_init(); |
262 | 263 | ||
@@ -281,8 +282,6 @@ void __init setup_arch(char **cmdline_p) | |||
281 | else | 282 | else |
282 | psci_acpi_init(); | 283 | psci_acpi_init(); |
283 | 284 | ||
284 | xen_early_init(); | ||
285 | |||
286 | cpu_read_bootcpu_ops(); | 285 | cpu_read_bootcpu_ops(); |
287 | smp_init_cpus(); | 286 | smp_init_cpus(); |
288 | smp_build_mpidr_hash(); | 287 | smp_build_mpidr_hash(); |