ia64/xen-unstable

changeset 3172:456cf7ce1617

bitkeeper revision 1.1159.183.20 (41a89e49OEN6UEWi5JkZeywhc2b_dg)

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 15:33:29 2004 +0000 (2004-11-27)
parents 08ca2c180189 6a5ee3eb47ac
children 1682efd8855e
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:06:37 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S	Sat Nov 27 15:33:29 2004 +0000
     1.3 @@ -319,8 +319,9 @@ restore_all:
     1.4  	RESTORE_ALL
     1.5  
     1.6  resume_vm86:
     1.7 +	XEN_UNBLOCK_EVENTS(%esi)
     1.8  	RESTORE_REGS
     1.9 -	pushl %eax,(%esp)
    1.10 +	movl %eax,(%esp)
    1.11  	movl $__HYPERVISOR_switch_vm86,%eax
    1.12  	int $0x82			# Atomically enables events delivery
    1.13  	ud2