[Xen-changelog] Ensure preempt_stop always loads %ebp with thread-info pointer.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1437, 2005/05/17 19:17:46+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Ensure preempt_stop always loads %ebp with thread-info pointer.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 entry.S |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S 
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S      2005-05-17 
15:02:19 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S      2005-05-17 
15:02:19 -04:00
@@ -108,7 +108,8 @@
 #define XEN_TEST_PENDING(reg)  testb $0xFF,evtchn_upcall_pending(reg)
 
 #ifdef CONFIG_PREEMPT
-#define preempt_stop           XEN_BLOCK_EVENTS(%esi)
+#define preempt_stop           GET_THREAD_INFO(%ebp)                   ; \
+                               XEN_BLOCK_EVENTS(%esi)
 #else
 #define preempt_stop
 #define resume_kernel          restore_all
@@ -127,7 +128,7 @@
        pushl %ebx; \
        movl $(__USER_DS), %edx; \
        movl %edx, %ds; \
-       movl %edx, %es
+       movl %edx, %es;
 
 #define RESTORE_INT_REGS \
        popl %ebx;      \

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog