aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/enlighten.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r--arch/x86/xen/enlighten.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index e90540a46a0b..50b20c64f0bd 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -841,7 +841,6 @@ static const struct pv_init_ops xen_init_ops __initdata = {
841 .patch = xen_patch, 841 .patch = xen_patch,
842 842
843 .banner = xen_banner, 843 .banner = xen_banner,
844 .memory_setup = xen_memory_setup,
845 .arch_setup = xen_arch_setup, 844 .arch_setup = xen_arch_setup,
846 .post_allocator_init = xen_post_allocator_init, 845 .post_allocator_init = xen_post_allocator_init,
847}; 846};
@@ -982,6 +981,8 @@ asmlinkage void __init xen_start_kernel(void)
982 pv_apic_ops = xen_apic_ops; 981 pv_apic_ops = xen_apic_ops;
983 pv_mmu_ops = xen_mmu_ops; 982 pv_mmu_ops = xen_mmu_ops;
984 983
984 x86_init.resources.memory_setup = xen_memory_setup;
985
985#ifdef CONFIG_X86_64 986#ifdef CONFIG_X86_64
986 /* 987 /*
987 * Setup percpu state. We only need to do this for 64-bit 988 * Setup percpu state. We only need to do this for 64-bit