aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/xen
diff options
context:
space:
mode:
authorJohn Stultz <johnstul@us.ibm.com>2010-03-11 17:04:47 -0500
committerThomas Gleixner <tglx@linutronix.de>2010-03-12 18:36:37 -0500
commitc4507257764ae0387f0d8c2ca57808f37e4c9439 (patch)
tree20262de6b99a398d4a17efa5080a5f9fa4c06451 /arch/x86/xen
parent522dba7134d6b2e5821d3457f7941ec34f668e6d (diff)
time: Clean up direct xtime usage in xen
Cleanup xen's direct use of internal timekeeping values. Signed-off-by: John Stultz <johnstul@us.ibm.com> Acked-by: Jeremy Fitzhardinge <jeremy@xensource.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/xen')
-rw-r--r--arch/x86/xen/time.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 0d3f07cd1b5..6365df925cb 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -475,6 +475,7 @@ void xen_timer_resume(void)
475__init void xen_time_init(void) 475__init void xen_time_init(void)
476{ 476{
477 int cpu = smp_processor_id(); 477 int cpu = smp_processor_id();
478 struct timespec tp;
478 479
479 clocksource_register(&xen_clocksource); 480 clocksource_register(&xen_clocksource);
480 481
@@ -486,9 +487,8 @@ __init void xen_time_init(void)
486 } 487 }
487 488
488 /* Set initial system time with full resolution */ 489 /* Set initial system time with full resolution */
489 xen_read_wallclock(&xtime); 490 xen_read_wallclock(&tp);
490 set_normalized_timespec(&wall_to_monotonic, 491 do_settimeofday(&tp);
491 -xtime.tv_sec, -xtime.tv_nsec);
492 492
493 setup_force_cpu_cap(X86_FEATURE_TSC); 493 setup_force_cpu_cap(X86_FEATURE_TSC);
494 494