diff options
| author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-08-10 17:06:29 +0000 |
|---|---|---|
| committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-08-10 17:06:29 +0000 |
| commit | b34f79ff69a657aae57e2f1b98ef0fb5d89ec6d0 (patch) | |
| tree | 6a43e36ba61c6e8cab659606aaa643b4d5a0a900 | |
| parent | 282447bac6abd368829d1ae8a887f54650edfacc (diff) | |
| parent | 90c0e3301d4d43db6d62df3870256894de990551 (diff) | |
| download | xen-b34f79ff69a657aae57e2f1b98ef0fb5d89ec6d0.tar.gz xen-b34f79ff69a657aae57e2f1b98ef0fb5d89ec6d0.tar.bz2 xen-b34f79ff69a657aae57e2f1b98ef0fb5d89ec6d0.zip | |
merge?
| -rw-r--r-- | linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c | 18 | ||||
| -rw-r--r-- | tools/xenstore/Makefile | 1 |
2 files changed, 8 insertions, 11 deletions
diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c index fe40dfd759..4e30c2ec83 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c @@ -209,8 +209,6 @@ void init_cpu_khz(void) 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 @@ void __init time_init(void) } #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,15 +875,13 @@ void time_resume(void) { init_cpu_khz(); - /* Get timebases for new environment. */ get_time_values_from_xen(); - update_wallclock(); - /* Reset our own concept of passage of system time. */ - processed_system_time = - per_cpu(shadow_time, smp_processor_id()).system_timestamp; + processed_system_time = per_cpu(shadow_time, 0).system_timestamp; per_cpu(processed_system_time, 0) = processed_system_time; + update_wallclock(); + per_cpu(timer_irq, 0) = bind_virq_to_irq(VIRQ_TIMER); (void)setup_irq(per_cpu(timer_irq, 0), &irq_timer); } diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 3113cddf0f..915f4de04b 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -1,6 +1,5 @@ XEN_ROOT=../.. include $(XEN_ROOT)/tools/Rules.mk -LIBDIR = lib XEN_LIBXC = $(XEN_ROOT)/tools/libxc INSTALL = install |