diff options
| author | smh22@tempest.cl.cam.ac.uk <smh22@tempest.cl.cam.ac.uk> | 2004-02-23 15:55:27 +0000 |
|---|---|---|
| committer | smh22@tempest.cl.cam.ac.uk <smh22@tempest.cl.cam.ac.uk> | 2004-02-23 15:55:27 +0000 |
| commit | 2b4a64fcc50fdfa1225933a4517b9382de87052d (patch) | |
| tree | 8b83cff318e1001b4256bf9f00de9fc67dfe955b /xenolinux-2.4.25-sparse | |
| parent | 766be60d93bcd1cf1339a6eccab27b4b7a0b9466 (diff) | |
| parent | aba2e38b750e5e2a29780acd31c83cf3bfe06f1f (diff) | |
| download | xen-2b4a64fcc50fdfa1225933a4517b9382de87052d.tar.gz xen-2b4a64fcc50fdfa1225933a4517b9382de87052d.tar.bz2 xen-2b4a64fcc50fdfa1225933a4517b9382de87052d.zip | |
bitkeeper revision 1.740 (403a226fqJ5W_9LYmfP6SzBktxb7SA)
Merge tempest.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into tempest.cl.cam.ac.uk:/local/scratch/smh22/xeno.bk
Diffstat (limited to 'xenolinux-2.4.25-sparse')
| -rw-r--r-- | xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c | 5 | ||||
| -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 |
3 files changed, 19 insertions, 3 deletions
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c index 883cee38fc..a91ed32a74 100644 --- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c +++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c @@ -164,6 +164,11 @@ int xenolinux_block_ioctl(struct inode *inode, struct file *filep, DPRINTK_IOCTL(" BLKGETSIZE: %x %lx\n", BLKGETSIZE, part->nr_sects); return put_user(part->nr_sects, (unsigned long *) argument); + case BLKGETSIZE64: + DPRINTK_IOCTL(" BLKGETSIZE64: %x %llx\n", BLKGETSIZE64, + (u64)part->nr_sects * 512); + return put_user((u64)part->nr_sects * 512, (u64 *) argument); + case BLKRRPART: /* re-read partition table */ DPRINTK_IOCTL(" BLKRRPART: %x\n", BLKRRPART); return xenolinux_block_revalidate(dev); 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__ */ |