ia64/xen-unstable

changeset 3177:80330a068d2a

bitkeeper revision 1.1159.183.22 (41a8b0d6FdgjqVgfA7ozpCUKMmhzrg)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Sat Nov 27 16:52:38 2004 +0000 (2004-11-27)
parents 1682efd8855e 65f69f55f074
children 01664279f443
files linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
line diff
     1.1 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S	Sat Nov 27 15:49:07 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S	Sat Nov 27 16:52:38 2004 +0000
     1.3 @@ -231,8 +231,8 @@ need_resched:
     1.4  	movl TI_flags(%ebp), %ecx	# need_resched set ?
     1.5  	testb $_TIF_NEED_RESCHED, %cl
     1.6  	jz restore_all
     1.7 -	testl $IF_MASK,EFLAGS(%esp)     # interrupts off (exception path) ?
     1.8 -	jz restore_all
     1.9 +	testb $0xFF,EVENT_MASK(%esp)	# interrupts off (exception path) ?
    1.10 +	jnz restore_all
    1.11  	movl $PREEMPT_ACTIVE,TI_preempt_count(%ebp)
    1.12  	XEN_UNBLOCK_EVENTS(%esi)
    1.13  	call schedule
    1.14 @@ -552,13 +552,13 @@ critical_fixup_table:
    1.15  
    1.16  # Hypervisor uses this for application faults while it executes.
    1.17  ENTRY(failsafe_callback)
    1.18 -1:      popl %ds
    1.19 -2:      popl %es
    1.20 -3:      popl %fs
    1.21 -4:      pop  %gs
    1.22 -        subl $4,%esp
    1.23 -        SAVE_ALL
    1.24 -        jmp  ret_from_exception
    1.25 +1:	popl %ds
    1.26 +2:	popl %es
    1.27 +3:	popl %fs
    1.28 +4:	popl %gs
    1.29 +	subl $4,%esp
    1.30 +	SAVE_ALL
    1.31 +	jmp  ret_from_exception
    1.32  .section .fixup,"ax";	\
    1.33  6:	movl $0,(%esp);	\
    1.34  	jmp 1b;		\