diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-02-23 15:20:12 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-02-23 15:20:12 +0000 |
| commit | aba2e38b750e5e2a29780acd31c83cf3bfe06f1f (patch) | |
| tree | 87608dd720f2632994d908272f8ffef7510b757e /xenolinux-2.4.25-sparse | |
| parent | a889cc40d0430617ff9429ed83b8deb3317db37d (diff) | |
| parent | b375e362233b818e46aecfda7b0dc38ddd233499 (diff) | |
| download | xen-aba2e38b750e5e2a29780acd31c83cf3bfe06f1f.tar.gz xen-aba2e38b750e5e2a29780acd31c83cf3bfe06f1f.tar.bz2 xen-aba2e38b750e5e2a29780acd31c83cf3bfe06f1f.zip | |
bitkeeper revision 1.737.1.2 (403a1a2c7OBYX_orB0J8LBxNFDEOdw)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/maw/xeno-unstable-ioctl.bk
Diffstat (limited to 'xenolinux-2.4.25-sparse')
| -rw-r--r-- | xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c | 2 | ||||
| -rw-r--r-- | xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c b/xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c index 0e0542236a..cb64f1fdb4 100644 --- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c +++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c @@ -532,7 +532,7 @@ int set_timeout_timer(void) alarm = __jiffies_to_st(timer->expires); /* Failure is pretty bad, but we'd best soldier on. */ - if ( HYPERVISOR_set_dom_timer(alarm) != 0 ) + if ( HYPERVISOR_set_timer_op(alarm) != 0 ) ret = -1; spin_unlock(&timerlist_lock); diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h b/xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h index 18dbe86ec1..e3cb2e0ac7 100644 --- a/xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h +++ b/xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h @@ -294,14 +294,14 @@ static inline int HYPERVISOR_stop(unsigned long srec) return ret; } -static inline long HYPERVISOR_set_dom_timer(u64 timeout) +static inline long HYPERVISOR_set_timer_op(u64 timeout) { int ret; unsigned long timeout_hi = (unsigned long)(timeout>>32); unsigned long timeout_lo = (unsigned long)timeout; __asm__ __volatile__ ( TRAP_INSTR - : "=a" (ret) : "0" (__HYPERVISOR_set_dom_timer), + : "=a" (ret) : "0" (__HYPERVISOR_set_timer_op), "b" (timeout_hi), "c" (timeout_lo) : "memory" ); return ret; @@ -435,4 +435,15 @@ static inline int HYPERVISOR_update_va_mapping( return ret; } +static inline int HYPERVISOR_xen_version(int cmd) +{ + int ret; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret) : "0" (__HYPERVISOR_xen_version), + "b" (cmd) : "memory" ); + + return ret; +} + #endif /* __HYPERVISOR_H__ */ |