# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID a5c488cd3627c9c4fc85f93da5a399817f55d64b
# Parent 3d470e8d41f05b044246df070ec4572416f7309f
# Parent 14aa0818c1cab85a6ed0bfb1f9759729967b3df4
merge?
diff -r 3d470e8d41f0 -r a5c488cd3627
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 16:47:07 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c Wed Aug 10 17:06:29 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);
diff -r 3d470e8d41f0 -r a5c488cd3627 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile Wed Aug 10 16:47:07 2005
+++ b/tools/xenstore/Makefile Wed Aug 10 17:06:29 2005
@@ -1,6 +1,5 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-LIBDIR = lib
XEN_LIBXC = $(XEN_ROOT)/tools/libxc
INSTALL = install
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home