bitkeeper revision 1.778 (404f5c24HB4-3O5d1LoEBPgmh5h6tg)

Makefile:
  Create Xen interface symlink.
time.c, hypervisor-if.h, kernel.c:
  Fix shared_info to make CPU TSC arch-dependent.

2 files changed, 3 insertions, 3 deletions

diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c
index 4af99cdd35..aa944f50c3 100644
--- a/extras/mini-os/kernel.c
+++ b/extras/mini-os/kernel.c
@@ -109,8 +109,8 @@ void start_kernel(start_info_t *si)
         printk(" %lx", si->net_rings[i]);
     }; printk("\n");
     printk("  blk_ring:   0x%lx\n", si->blk_ring);
-#endif
     printk("  dom_id:     %ld\n",  si->dom_id);
+#endif
     printk("  flags:      0x%lx\n", si->flags);
     printk("  cmd_line:   %s\n",  si->cmd_line ? (const char *)si->cmd_line : "NULL");
 
diff --git a/extras/mini-os/time.c b/extras/mini-os/time.c
index 12356b0a03..df3a62e4dd 100644
--- a/extras/mini-os/time.c
+++ b/extras/mini-os/time.c
@@ -70,7 +70,7 @@ static void get_time_values_from_xen(void)
         rmb();
         shadow_tv.tv_sec    = HYPERVISOR_shared_info->wc_sec;
         shadow_tv.tv_usec   = HYPERVISOR_shared_info->wc_usec;
-        shadow_tsc_stamp    = HYPERVISOR_shared_info->tsc_timestamp;
+        shadow_tsc_stamp    = HYPERVISOR_shared_info->tsc_timestamp.tsc_bits;
         shadow_system_time  = HYPERVISOR_shared_info->system_time;
         rmb();
     }
@@ -167,7 +167,7 @@ void init_time(void)
     __cpu_khz = HYPERVISOR_shared_info->cpu_freq;
     cpu_khz = (u32) (__cpu_khz/1000);
 
-    rdtsc_bitshift = HYPERVISOR_shared_info->rdtsc_bitshift;
+    rdtsc_bitshift = HYPERVISOR_shared_info->tsc_timestamp.tsc_bitshift;
     cpu_freq       = HYPERVISOR_shared_info->cpu_freq;
 
     scale = 1000000LL << (32 + rdtsc_bitshift);