ia64/xen-unstable

changeset 18928:21bbb41f9af2

x86: Small cleanups to time handling.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Dec 15 11:17:14 2008 +0000 (2008-12-15)
parents 045f70d1acdb
children 65bbc9ec3849
files xen/arch/x86/time.c
line diff
     1.1 --- a/xen/arch/x86/time.c	Sat Dec 13 17:44:20 2008 +0000
     1.2 +++ b/xen/arch/x86/time.c	Mon Dec 15 11:17:14 2008 +0000
     1.3 @@ -659,6 +659,7 @@ static void init_platform_timer(void)
     1.4      plt_overflow(NULL);
     1.5  
     1.6      platform_timer_stamp = plt_stamp64;
     1.7 +    stime_platform_stamp = NOW();
     1.8  
     1.9      printk("Platform timer is %s %s\n",
    1.10             freq_string(pts->frequency), pts->name);
    1.11 @@ -1109,7 +1110,7 @@ void init_percpu_time(void)
    1.12  
    1.13      local_irq_save(flags);
    1.14      rdtscll(t->local_tsc_stamp);
    1.15 -    now = !plt_src.read_counter ? 0 : read_platform_stime();
    1.16 +    now = read_platform_stime();
    1.17      local_irq_restore(flags);
    1.18  
    1.19      t->stime_master_stamp = now;
    1.20 @@ -1137,7 +1138,6 @@ int __init init_xen_time(void)
    1.21      /* NB. get_cmos_time() can take over one second to execute. */
    1.22      do_settime(get_cmos_time(), 0, NOW());
    1.23  
    1.24 -    stime_platform_stamp = NOW();
    1.25      init_platform_timer();
    1.26  
    1.27      init_percpu_time();