Mini-OS: Add monotonic_clock to minios_ namespace

This is needed by rumphyper_base, among other things. Unclear how it is
possible that the build was working until now, separating the Mini-OS
and rumprun build systems exposed this.

Signed-off-by: Martin Lucina <martin@lucina.net>

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index f258ae86a6fee770b6a7a7b0519c6e89dea854cc..c86f45a31f5adc2de7580fea6869dd59dfbca247 100644 (file)
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -150,7 +150,7 @@ static void get_time_values_from_xen(void)
  *             Note: This function is required to return accurate
  *             time even in the absence of multiple timer ticks.
  */
-uint64_t monotonic_clock(void)
+uint64_t minios_monotonic_clock(void)
 {
        uint64_t time;
        uint32_t local_time_version;
@@ -185,7 +185,7 @@ static void update_wallclock(void)
 void block_domain(s_time_t until)
 {
     ASSERT(irqs_disabled());
-    if(monotonic_clock() < until)
+    if(minios_monotonic_clock() < until)
     {
         HYPERVISOR_set_timer_op(until);
         HYPERVISOR_sched_op(SCHEDOP_block, 0);

diff --git a/xen/include/mini-os/time.h b/xen/include/mini-os/time.h
index 00c90dc0d2566a546388cd1bf378e84e6e24604f..8bb0f8ef649552d097327d47a8a6f74229875b31 100644 (file)
--- a/xen/include/mini-os/time.h
+++ b/xen/include/mini-os/time.h
@@ -30,7 +30,7 @@
  * of real time into system time 
  */
 typedef int64_t s_time_t;
-#define NOW()                   ((s_time_t)monotonic_clock())
+#define NOW()                   ((s_time_t)minios_monotonic_clock())
 #define SECONDS(_s)             (((s_time_t)(_s))  * 1000000000UL )
 #define TENTHS(_ts)             (((s_time_t)(_ts)) * 100000000UL )
 #define HUNDREDTHS(_hs)         (((s_time_t)(_hs)) * 10000000UL )
@@ -50,7 +50,7 @@ void     init_time(void);
 void     fini_time(void);
 s_time_t get_s_time(void);
 s_time_t get_v_time(void);
-uint64_t monotonic_clock(void);
+uint64_t minios_monotonic_clock(void);
 void     block_domain(s_time_t until);
 
 #endif /* _MINIOS_TIME_H_ */