bitkeeper revision 1.737.2.1 (403a19687Hq5Q8vjslGwmnEJKF9-Sg)

hypervisor.h, time.c, hypervisor-if.h, kernel.c, entry.S:
  Sanitise hypercall numbering. Added a get-xen-version hypercall.

diff --git a/h/hypervisor.h b/h/hypervisor.h
index ad11c39a452e3ebf2cf2d2d4fce4ec613c35278b..c0f927594569366ce1a3a9eda1f767977f938927 100644 (file)
--- a/h/hypervisor.h
+++ b/h/hypervisor.h
@@ -176,12 +176,12 @@ static __inline__ int HYPERVISOR_stop(unsigned long srec)
     return ret;
 }
 
-static __inline__ long HYPERVISOR_set_dom_timer(void *timer_arg)
+static __inline__ long HYPERVISOR_set_timer_op(void *timer_arg)
 {
     int ret;
     __asm__ __volatile__ (
         TRAP_INSTR
-        : "=a" (ret) : "0" (__HYPERVISOR_set_dom_timer),
+        : "=a" (ret) : "0" (__HYPERVISOR_set_timer_op),
         "b" (timer_arg) : "memory" );
 
     return ret;