[Xen-changelog] Small time fixes.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 662c9d34b3c70e5668b7a639a02461794c052713
# Parent  49671266459c22862ce878a0cb4386905ebac607
Small time fixes.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 49671266459c -r 662c9d34b3c7 
linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c  Wed Aug 10 15:14:50 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c  Wed Aug 10 16:03:31 2005
@@ -209,8 +209,6 @@
                cpu_khz = __cpu_khz >> -info->tsc_shift;
        else
                cpu_khz = __cpu_khz << info->tsc_shift;
-       printk(KERN_INFO "Xen reported: %lu.%03lu MHz processor.\n",
-              cpu_khz / 1000, cpu_khz % 1000);
 }
 
 static u64 get_nsec_offset(struct shadow_time_info *shadow)
@@ -794,13 +792,15 @@
        }
 #endif
        get_time_values_from_xen();
-       update_wallclock();
-       set_normalized_timespec(&wall_to_monotonic,
-               -xtime.tv_sec, -xtime.tv_nsec);
+
        processed_system_time = per_cpu(shadow_time, 0).system_timestamp;
        per_cpu(processed_system_time, 0) = processed_system_time;
 
+       update_wallclock();
+
        init_cpu_khz();
+       printk(KERN_INFO "Xen reported: %lu.%03lu MHz processor.\n",
+              cpu_khz / 1000, cpu_khz % 1000);
 
 #if defined(__x86_64__)
        vxtime.mode = VXTIME_TSC;
@@ -875,14 +875,12 @@
 {
        init_cpu_khz();
 
-       /* Get timebases for new environment. */ 
        get_time_values_from_xen();
+
+       processed_system_time = per_cpu(shadow_time, 0).system_timestamp;
+       per_cpu(processed_system_time, 0) = processed_system_time;
+
        update_wallclock();
-
-       /* Reset our own concept of passage of system time. */
-       processed_system_time =
-               per_cpu(shadow_time, smp_processor_id()).system_timestamp;
-       per_cpu(processed_system_time, 0) = processed_system_time;
 
        per_cpu(timer_irq, 0) = bind_virq_to_irq(VIRQ_TIMER);
        (void)setup_irq(per_cpu(timer_irq, 0), &irq_timer);

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