ia64/xen-unstable

changeset 4965:9950cd01cebe

bitkeeper revision 1.1437 (428a354asmqlyMWB8fzDzH6eMgDLow)

Ensure preempt_stop always loads %ebp with thread-info pointer.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue May 17 18:17:46 2005 +0000 (2005-05-17)
parents 019ead2b2718
children b1edecef79f8
files linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S	Tue May 17 18:04:24 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S	Tue May 17 18:17:46 2005 +0000
     1.3 @@ -108,7 +108,8 @@ VM_MASK		= 0x00020000
     1.4  #define XEN_TEST_PENDING(reg)	testb $0xFF,evtchn_upcall_pending(reg)
     1.5  
     1.6  #ifdef CONFIG_PREEMPT
     1.7 -#define preempt_stop		XEN_BLOCK_EVENTS(%esi)
     1.8 +#define preempt_stop		GET_THREAD_INFO(%ebp)			; \
     1.9 +				XEN_BLOCK_EVENTS(%esi)
    1.10  #else
    1.11  #define preempt_stop
    1.12  #define resume_kernel		restore_all
    1.13 @@ -127,7 +128,7 @@ VM_MASK		= 0x00020000
    1.14  	pushl %ebx; \
    1.15  	movl $(__USER_DS), %edx; \
    1.16  	movl %edx, %ds; \
    1.17 -	movl %edx, %es
    1.18 +	movl %edx, %es;
    1.19  
    1.20  #define RESTORE_INT_REGS \
    1.21  	popl %ebx;	\