diff options
| author |   Shannon Zhao <shannon.zhao@linaro.org> | 2016-04-07 20:03:28 +0800 |
|---|---|---|
| committer |   David Vrabel <david.vrabel@citrix.com> | 2016-07-06 10:34:45 +0100 |
| commit | 9b08aaa3199a4dffca73c7cdec813b483b5b2d3b (patch) | |
| tree | 4270284902d30207db29261bde3079b9b9f16241 /arch/arm/kernel/setup.c | |
| parent | arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI (diff) | |
| download | linux-dev-9b08aaa3199a4dffca73c7cdec813b483b5b2d3b.tar.xz linux-dev-9b08aaa3199a4dffca73c7cdec813b483b5b2d3b.zip | |
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/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 7b5350060612..261dae6f3fec 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -1064,6 +1064,7 @@ void __init setup_arch(char **cmdline_p) early_paging_init(mdesc); #endif setup_dma_zone(mdesc); + xen_early_init(); efi_init(); sanity_check_meminfo(); arm_memblock_init(mdesc); @@ -1080,7 +1081,6 @@ void __init setup_arch(char **cmdline_p) arm_dt_init_cpu_maps(); psci_dt_init(); - xen_early_init(); #ifdef CONFIG_SMP if (is_smp()) { if (!mdesc->smp_init || !mdesc->smp_init()) { |