direct-io.hg

changeset 3312:c55cd4b21325

bitkeeper revision 1.1159.1.497 (41c85fb6Idmg_bfo7zG528C4ntiZkw)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Tue Dec 21 17:39:02 2004 +0000 (2004-12-21)
parents c754bd0be650 52a19a143c6b
children 32952707e391
files linux-2.4.28-xen-sparse/arch/xen/kernel/time.c
line diff
     1.1 --- a/linux-2.4.28-xen-sparse/arch/xen/kernel/time.c	Tue Dec 21 17:38:54 2004 +0000
     1.2 +++ b/linux-2.4.28-xen-sparse/arch/xen/kernel/time.c	Tue Dec 21 17:39:02 2004 +0000
     1.3 @@ -266,6 +266,9 @@ void do_gettimeofday(struct timeval *tv)
     1.4      _tv.tv_sec   = xtime.tv_sec;
     1.5      _tv.tv_usec += xtime.tv_usec;
     1.6  
     1.7 +    _tv.tv_usec += 
     1.8 +        (unsigned long)(shadow_system_time - processed_system_time) / 1000UL;
     1.9 +
    1.10      if ( unlikely(!TIME_VALUES_UP_TO_DATE) )
    1.11      {
    1.12          /*
    1.13 @@ -315,6 +318,8 @@ void do_settimeofday(struct timeval *tv)
    1.14       */
    1.15   again:
    1.16      usec = tv->tv_usec - __get_time_delta_usecs();
    1.17 +    usec -= 
    1.18 +        (unsigned long)(shadow_system_time - processed_system_time) / 1000UL;
    1.19      if ( unlikely(!TIME_VALUES_UP_TO_DATE) )
    1.20      {
    1.21          __get_time_values_from_xen();