aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/xen
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/xen')
-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 84826b842b54..ee8cac77c8a4 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -844,7 +844,6 @@ static const struct pv_init_ops xen_init_ops __initdata = {
844static const struct pv_time_ops xen_time_ops __initdata = { 844static const struct pv_time_ops xen_time_ops __initdata = {
845 .set_wallclock = xen_set_wallclock, 845 .set_wallclock = xen_set_wallclock,
846 .get_wallclock = xen_get_wallclock, 846 .get_wallclock = xen_get_wallclock,
847 .get_tsc_khz = xen_tsc_khz,
848 .sched_clock = xen_sched_clock, 847 .sched_clock = xen_sched_clock,
849}; 848};
850 849
@@ -980,6 +979,8 @@ asmlinkage void __init xen_start_kernel(void)
980 x86_init.timers.setup_percpu_clockev = x86_init_noop; 979 x86_init.timers.setup_percpu_clockev = x86_init_noop;
981 x86_cpuinit.setup_percpu_clockev = x86_init_noop; 980 x86_cpuinit.setup_percpu_clockev = x86_init_noop;
982 981
982 x86_platform.calibrate_tsc = xen_tsc_khz;
983
983#ifdef CONFIG_X86_64 984#ifdef CONFIG_X86_64
984 /* 985 /*
985 * Setup percpu state. We only need to do this for 64-bit 986 * Setup percpu state. We only need to do this for 64-bit