direct-io.hg

changeset 791:22057fc2142f

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
author iap10@labyrinth.cl.cam.ac.uk
date Mon Oct 06 17:06:26 2003 +0000 (2003-10-06)
parents a3daaeea74de 9c21e28c40a0
children 34473973889b
files xen/common/memory.c xenolinux-2.4.22-sparse/arch/xeno/kernel/entry.S
line diff
     1.1 --- a/xen/common/memory.c	Mon Oct 06 16:57:00 2003 +0000
     1.2 +++ b/xen/common/memory.c	Mon Oct 06 17:06:26 2003 +0000
     1.3 @@ -871,6 +871,6 @@ int do_process_page_updates(page_update_
     1.4  
     1.5      }
     1.6  
     1.7 -    return(0);
     1.8 +    return 0;
     1.9  }
    1.10  
     2.1 --- a/xenolinux-2.4.22-sparse/arch/xeno/kernel/entry.S	Mon Oct 06 16:57:00 2003 +0000
     2.2 +++ b/xenolinux-2.4.22-sparse/arch/xeno/kernel/entry.S	Mon Oct 06 17:06:26 2003 +0000
     2.3 @@ -181,7 +181,6 @@ ENTRY(lcall27)
     2.4  	popl %eax
     2.5  	jmp ret_from_sys_call
     2.6  
     2.7 -        
     2.8  ENTRY(ret_from_fork)
     2.9  	pushl %ebx
    2.10  	call SYMBOL_NAME(schedule_tail)
    2.11 @@ -197,7 +196,6 @@ ENTRY(ret_from_fork)
    2.12   * go as quickly as possible which is why some of this is
    2.13   * less clear than it otherwise should be.
    2.14   */
    2.15 -
    2.16  ENTRY(system_call)
    2.17  	pushl %eax			# save orig_eax
    2.18  	SAVE_ALL
    2.19 @@ -211,7 +209,7 @@ ENTRY(system_call)
    2.20  ENTRY(ret_from_sys_call)
    2.21          movl SYMBOL_NAME(HYPERVISOR_shared_info),%esi
    2.22          btrl $EVENTS_MASTER_ENABLE_BIT,4(%esi) # make tests atomic
    2.23 -ret_syscall_tests:      
    2.24 +ret_syscall_tests:
    2.25  	cmpl $0,need_resched(%ebx)
    2.26  	jne reschedule
    2.27  	cmpl $0,sigpending(%ebx)
    2.28 @@ -314,13 +312,12 @@ 11:     push %esp
    2.29          call do_hypervisor_callback
    2.30          add  $4,%esp
    2.31          movl SYMBOL_NAME(HYPERVISOR_shared_info),%esi
    2.32 -        xorl %eax,%eax
    2.33          movb CS(%esp),%cl
    2.34  	test $2,%cl          # slow return to ring 2 or 3
    2.35  	jne  ret_syscall_tests
    2.36  safesti:btsl $EVENTS_MASTER_ENABLE_BIT,4(%esi) # reenable event callbacks
    2.37  scrit:  /**** START OF CRITICAL REGION ****/
    2.38 -        cmpl %eax,(%esi)
    2.39 +        cmpl $0,(%esi)
    2.40          jne  14f              # process more events if necessary...
    2.41          RESTORE_ALL
    2.42  14:     btrl $EVENTS_MASTER_ENABLE_BIT,4(%esi)
    2.43 @@ -352,7 +349,7 @@ 16:     movl %edi,%esp        # final %e
    2.44          jmp  11b
    2.45          
    2.46  critical_fixup_table:        
    2.47 -        .byte 0x00,0x00                       # cmpl %eax,(%esi)
    2.48 +        .byte 0x00,0x00,0x00                  # cmpl $0,(%esi)
    2.49          .byte 0x00,0x00                       # jne  14f
    2.50          .byte 0x00                            # pop  %ebx
    2.51          .byte 0x04                            # pop  %ecx