summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <johnstul@us.ibm.com>2010-03-12 01:04:47 +0300
committerThomas Gleixner <tglx@linutronix.de>2010-03-13 02:36:37 +0300
commitc4507257764ae0387f0d8c2ca57808f37e4c9439 (patch)
tree20262de6b99a398d4a17efa5080a5f9fa4c06451
parent522dba7134d6b2e5821d3457f7941ec34f668e6d (diff)
downloadlinux-c4507257764ae0387f0d8c2ca57808f37e4c9439.tar.xz
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>
-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 0d3f07cd1b5f..6365df925cb1 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -475,6 +475,7 @@ void xen_timer_resume(void)
__init void xen_time_init(void)
{
int cpu = smp_processor_id();
+ struct timespec tp;
clocksource_register(&xen_clocksource);
@@ -486,9 +487,8 @@ __init void xen_time_init(void)
}
/* Set initial system time with full resolution */
- xen_read_wallclock(&xtime);
- set_normalized_timespec(&wall_to_monotonic,
- -xtime.tv_sec, -xtime.tv_nsec);
+ xen_read_wallclock(&tp);
+ do_settimeofday(&tp);
setup_force_cpu_cap(X86_FEATURE_TSC);