direct-io.hg

annotate patches/linux-2.6.16.33/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch @ 12988:e080700efa56

[TOOLS] Fix the build. Clearly demarcate PPC-specific stuff.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Wed Dec 13 10:23:53 2006 +0000 (2006-12-13)
parents 6c2c7ff6265a
children
rev   line source
ian@12592 1 diff -pruN ../orig-linux-2.6.16.29/arch/i386/kernel/entry.S ./arch/i386/kernel/entry.S
ian@12592 2 --- ../orig-linux-2.6.16.29/arch/i386/kernel/entry.S 2006-09-12 19:02:10.000000000 +0100
ian@12592 3 +++ ./arch/i386/kernel/entry.S 2006-09-19 14:05:44.000000000 +0100
ian@12592 4 @@ -177,7 +177,7 @@ need_resched:
ian@12592 5
ian@12592 6 # sysenter call handler stub
ian@12592 7 ENTRY(sysenter_entry)
ian@12592 8 - movl TSS_sysenter_esp0(%esp),%esp
ian@12592 9 + movl SYSENTER_stack_esp0(%esp),%esp
ian@12592 10 sysenter_past_esp:
ian@12592 11 sti
ian@12592 12 pushl $(__USER_DS)
ian@12592 13 @@ -492,7 +492,7 @@ device_not_available_emulate:
ian@12592 14 * that sets up the real kernel stack. Check here, since we can't
ian@12592 15 * allow the wrong stack to be used.
ian@12592 16 *
ian@12592 17 - * "TSS_sysenter_esp0+12" is because the NMI/debug handler will have
ian@12592 18 + * "SYSENTER_stack_esp0+12" is because the NMI/debug handler will have
ian@12592 19 * already pushed 3 words if it hits on the sysenter instruction:
ian@12592 20 * eflags, cs and eip.
ian@12592 21 *
ian@12592 22 @@ -504,7 +504,7 @@ device_not_available_emulate:
ian@12592 23 cmpw $__KERNEL_CS,4(%esp); \
ian@12592 24 jne ok; \
ian@12592 25 label: \
ian@12592 26 - movl TSS_sysenter_esp0+offset(%esp),%esp; \
ian@12592 27 + movl SYSENTER_stack_esp0+offset(%esp),%esp; \
ian@12592 28 pushfl; \
ian@12592 29 pushl $__KERNEL_CS; \
ian@12592 30 pushl $sysenter_past_esp