aboutsummaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2004-02-23 15:16:56 +0000
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2004-02-23 15:16:56 +0000
commitb375e362233b818e46aecfda7b0dc38ddd233499 (patch)
tree2d7cf4740ad8547838af602a8c79eabc4e1ac810 /extras
parent18626a5fa6e9b71453b6a34227bace72761a1c60 (diff)
downloadxen-b375e362233b818e46aecfda7b0dc38ddd233499.tar.gz
xen-b375e362233b818e46aecfda7b0dc38ddd233499.tar.bz2
xen-b375e362233b818e46aecfda7b0dc38ddd233499.zip
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.
Diffstat (limited to 'extras')
-rw-r--r--extras/mini-os/h/hypervisor.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/extras/mini-os/h/hypervisor.h b/extras/mini-os/h/hypervisor.h
index ad11c39a45..c0f9275945 100644
--- a/extras/mini-os/h/hypervisor.h
+++ b/extras/mini-os/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;