# HG changeset patch
# User kaf24@scramble.cl.cam.ac.uk
# Date 1103650742 0
# Node ID c55cd4b2132518173ae9c2f63d58ff248eae2799
# Parent  c754bd0be650ccb0ed40fda5641ada2343f410ea# Parent  52a19a143c6b6d3a0edf4253b656e60d92d6462c
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


diff -r c754bd0be650 -r c55cd4b21325 linux-2.4.28-xen-sparse/arch/xen/kernel/time.c
--- a/linux-2.4.28-xen-sparse/arch/xen/kernel/time.c	Tue Dec 21 17:38:54 2004 +0000
+++ b/linux-2.4.28-xen-sparse/arch/xen/kernel/time.c	Tue Dec 21 17:39:02 2004 +0000
@@ -266,6 +266,9 @@ void do_gettimeofday(struct timeval *tv)
     _tv.tv_sec   = xtime.tv_sec;
     _tv.tv_usec += xtime.tv_usec;
 
+    _tv.tv_usec += 
+        (unsigned long)(shadow_system_time - processed_system_time) / 1000UL;
+
     if ( unlikely(!TIME_VALUES_UP_TO_DATE) )
     {
         /*
@@ -315,6 +318,8 @@ void do_settimeofday(struct timeval *tv)
      */
  again:
     usec = tv->tv_usec - __get_time_delta_usecs();
+    usec -= 
+        (unsigned long)(shadow_system_time - processed_system_time) / 1000UL;
     if ( unlikely(!TIME_VALUES_UP_TO_DATE) )
     {
         __get_time_values_from_xen();