[Xen-changelog] [xen-unstable] x86: Small cleanups to time handling.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1229339834 0
# Node ID 21bbb41f9af254a7b5fd367be2e3acd5ae06cb11
# Parent  045f70d1acdb3adbf6c8fd6132b02228867c9258
x86: Small cleanups to time handling.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/time.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 045f70d1acdb -r 21bbb41f9af2 xen/arch/x86/time.c
--- a/xen/arch/x86/time.c       Sat Dec 13 17:44:20 2008 +0000
+++ b/xen/arch/x86/time.c       Mon Dec 15 11:17:14 2008 +0000
@@ -659,6 +659,7 @@ static void init_platform_timer(void)
     plt_overflow(NULL);
 
     platform_timer_stamp = plt_stamp64;
+    stime_platform_stamp = NOW();
 
     printk("Platform timer is %s %s\n",
            freq_string(pts->frequency), pts->name);
@@ -1109,7 +1110,7 @@ void init_percpu_time(void)
 
     local_irq_save(flags);
     rdtscll(t->local_tsc_stamp);
-    now = !plt_src.read_counter ? 0 : read_platform_stime();
+    now = read_platform_stime();
     local_irq_restore(flags);
 
     t->stime_master_stamp = now;
@@ -1137,7 +1138,6 @@ int __init init_xen_time(void)
     /* NB. get_cmos_time() can take over one second to execute. */
     do_settime(get_cmos_time(), 0, NOW());
 
-    stime_platform_stamp = NOW();
     init_platform_timer();
 
     init_percpu_time();

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog