diff options
| author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-10-06 17:06:26 +0000 |
|---|---|---|
| committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-10-06 17:06:26 +0000 |
| commit | cc2ec41082ca2cc7c641794b3f52c4ee8233dc5f (patch) | |
| tree | 6ee359ea7a59ac311dfddcea69f0b0d3f022d2ca | |
| parent | 1de7b9500fb5ee7e4c348a80a33aa9ebf839dfe3 (diff) | |
| parent | e3cc18e10ad5790e24830c36c20cba5a2f669f4d (diff) | |
| download | xen-cc2ec41082ca2cc7c641794b3f52c4ee8233dc5f.tar.gz xen-cc2ec41082ca2cc7c641794b3f52c4ee8233dc5f.tar.bz2 xen-cc2ec41082ca2cc7c641794b3f52c4ee8233dc5f.zip | |
bitkeeper revision 1.482 (3f81a112aBfPL7h4KSh8KyZ5EQFL3g)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/rn212/xeno.mini
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
| -rw-r--r-- | xen/common/memory.c | 2 | ||||
| -rw-r--r-- | xenolinux-2.4.22-sparse/arch/xeno/kernel/entry.S | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/xen/common/memory.c b/xen/common/memory.c index 576a531480..b3f1417f61 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -871,6 +871,6 @@ int do_process_page_updates(page_update_request_t *ureqs, int count) } - return(0); + return 0; } diff --git a/xenolinux-2.4.22-sparse/arch/xeno/kernel/entry.S b/xenolinux-2.4.22-sparse/arch/xeno/kernel/entry.S index 9c909e3f7b..4f676eefc6 100644 --- a/xenolinux-2.4.22-sparse/arch/xeno/kernel/entry.S +++ b/xenolinux-2.4.22-sparse/arch/xeno/kernel/entry.S @@ -181,7 +181,6 @@ ENTRY(lcall27) popl %eax jmp ret_from_sys_call - ENTRY(ret_from_fork) pushl %ebx call SYMBOL_NAME(schedule_tail) @@ -197,7 +196,6 @@ ENTRY(ret_from_fork) * go as quickly as possible which is why some of this is * less clear than it otherwise should be. */ - ENTRY(system_call) pushl %eax # save orig_eax SAVE_ALL @@ -211,7 +209,7 @@ ENTRY(system_call) ENTRY(ret_from_sys_call) movl SYMBOL_NAME(HYPERVISOR_shared_info),%esi btrl $EVENTS_MASTER_ENABLE_BIT,4(%esi) # make tests atomic -ret_syscall_tests: +ret_syscall_tests: cmpl $0,need_resched(%ebx) jne reschedule cmpl $0,sigpending(%ebx) @@ -314,13 +312,12 @@ ENTRY(hypervisor_callback) call do_hypervisor_callback add $4,%esp movl SYMBOL_NAME(HYPERVISOR_shared_info),%esi - xorl %eax,%eax movb CS(%esp),%cl test $2,%cl # slow return to ring 2 or 3 jne ret_syscall_tests safesti:btsl $EVENTS_MASTER_ENABLE_BIT,4(%esi) # reenable event callbacks scrit: /**** START OF CRITICAL REGION ****/ - cmpl %eax,(%esi) + cmpl $0,(%esi) jne 14f # process more events if necessary... RESTORE_ALL 14: btrl $EVENTS_MASTER_ENABLE_BIT,4(%esi) @@ -352,7 +349,7 @@ critical_region_fixup: jmp 11b critical_fixup_table: - .byte 0x00,0x00 # cmpl %eax,(%esi) + .byte 0x00,0x00,0x00 # cmpl $0,(%esi) .byte 0x00,0x00 # jne 14f .byte 0x00 # pop %ebx .byte 0x04 # pop %ecx |