diff options
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index a924caa168dd..14e597e0c160 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -912,8 +912,6 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { | |||
912 | 912 | ||
913 | static const struct pv_apic_ops xen_apic_ops __initdata = { | 913 | static const struct pv_apic_ops xen_apic_ops __initdata = { |
914 | #ifdef CONFIG_X86_LOCAL_APIC | 914 | #ifdef CONFIG_X86_LOCAL_APIC |
915 | .setup_boot_clock = paravirt_nop, | ||
916 | .setup_secondary_clock = paravirt_nop, | ||
917 | .startup_ipi_hook = paravirt_nop, | 915 | .startup_ipi_hook = paravirt_nop, |
918 | #endif | 916 | #endif |
919 | }; | 917 | }; |
@@ -979,6 +977,8 @@ asmlinkage void __init xen_start_kernel(void) | |||
979 | x86_init.resources.memory_setup = xen_memory_setup; | 977 | x86_init.resources.memory_setup = xen_memory_setup; |
980 | x86_init.oem.arch_setup = xen_arch_setup; | 978 | x86_init.oem.arch_setup = xen_arch_setup; |
981 | x86_init.oem.banner = xen_banner; | 979 | x86_init.oem.banner = xen_banner; |
980 | x86_init.timers.setup_percpu_clockev = x86_init_noop; | ||
981 | x86_cpuinit.setup_percpu_clockev = x86_init_noop; | ||
982 | 982 | ||
983 | #ifdef CONFIG_X86_64 | 983 | #ifdef CONFIG_X86_64 |
984 | /* | 984 | /* |