ia64/xen-unstable

changeset 3173:d6a4c4fad37e

bitkeeper revision 1.1159.187.24 (41a8a1cfEx5fQ9XNJg_Yxyv0C74XUA)

Fix stack padding in failsafe callback. Remove an erroneous asm comment.
author kaf24@scramble.cl.cam.ac.uk
date Sat Nov 27 15:48:31 2004 +0000 (2004-11-27)
parents 6a5ee3eb47ac
children 1682efd8855e 65f69f55f074
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:32:50 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S	Sat Nov 27 15:48:31 2004 +0000
     1.3 @@ -323,7 +323,7 @@ resume_vm86:
     1.4  	RESTORE_REGS
     1.5  	movl %eax,(%esp)
     1.6  	movl $__HYPERVISOR_switch_vm86,%eax
     1.7 -	int $0x82			# Atomically enables events delivery
     1.8 +	int $0x82
     1.9  	ud2
    1.10  
    1.11  	# perform work that needs to be done immediately before resumption
    1.12 @@ -555,7 +555,8 @@ ENTRY(failsafe_callback)
    1.13  1:      popl %ds
    1.14  2:      popl %es
    1.15  3:      popl %fs
    1.16 -4:      popl %gs
    1.17 +4:      pop  %gs
    1.18 +        subl $4,%esp
    1.19          SAVE_ALL
    1.20          jmp  ret_from_exception
    1.21  .section .fixup,"ax";	\