git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-4.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
kernel
/
setup.c
diff --git
a/arch/arm64/kernel/setup.c
b/arch/arm64/kernel/setup.c
index 5b8256770e221d2e0deda02f2e3015143035caeb..2981f1bdd07336c29f50c83a628fef43ce597db5 100644
(file)
--- a/
arch/arm64/kernel/setup.c
+++ b/
arch/arm64/kernel/setup.c
@@
-257,6
+257,7
@@
void __init setup_arch(char **cmdline_p)
*/
cpu_uninstall_idmap();
+ xen_early_init();
efi_init();
arm64_memblock_init();
@@
-283,8
+284,6
@@
void __init setup_arch(char **cmdline_p)
else
psci_acpi_init();
- xen_early_init();
-
cpu_read_bootcpu_ops();
smp_init_cpus();
smp_build_mpidr_hash();