diff options
| author |   John Stultz <johnstul@us.ibm.com> | 2010-03-11 14:04:47 -0800 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2010-03-13 00:36:37 +0100 |
| commit | c4507257764ae0387f0d8c2ca57808f37e4c9439 (patch) | |
| tree | 20262de6b99a398d4a17efa5080a5f9fa4c06451 /arch/x86/xen/time.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 (diff) | |
| download | linux-dev-c4507257764ae0387f0d8c2ca57808f37e4c9439.tar.xz linux-dev-c4507257764ae0387f0d8c2ca57808f37e4c9439.zip | |
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/time.c')
| -rw-r--r-- | arch/x86/xen/time.c | 6 |
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); |