ia64/xen-unstable

view patches/linux-2.6.16.29/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch @ 11834:3cc0b589c235

Added tag 3.0.3-branched for changeset 6ed4368b4a9e1924c983774c4b1a2b6baf8e98a6
author kfraser@localhost.localdomain
date Tue Oct 17 09:59:11 2006 +0100 (2006-10-17)
parents 041be3f6b38e
children
line source
1 diff -pruN ../orig-linux-2.6.16.29/arch/i386/kernel/entry.S ./arch/i386/kernel/entry.S
2 --- ../orig-linux-2.6.16.29/arch/i386/kernel/entry.S 2006-09-12 19:02:10.000000000 +0100
3 +++ ./arch/i386/kernel/entry.S 2006-09-19 14:05:44.000000000 +0100
4 @@ -177,7 +177,7 @@ need_resched:
6 # sysenter call handler stub
7 ENTRY(sysenter_entry)
8 - movl TSS_sysenter_esp0(%esp),%esp
9 + movl SYSENTER_stack_esp0(%esp),%esp
10 sysenter_past_esp:
11 sti
12 pushl $(__USER_DS)
13 @@ -492,7 +492,7 @@ device_not_available_emulate:
14 * that sets up the real kernel stack. Check here, since we can't
15 * allow the wrong stack to be used.
16 *
17 - * "TSS_sysenter_esp0+12" is because the NMI/debug handler will have
18 + * "SYSENTER_stack_esp0+12" is because the NMI/debug handler will have
19 * already pushed 3 words if it hits on the sysenter instruction:
20 * eflags, cs and eip.
21 *
22 @@ -504,7 +504,7 @@ device_not_available_emulate:
23 cmpw $__KERNEL_CS,4(%esp); \
24 jne ok; \
25 label: \
26 - movl TSS_sysenter_esp0+offset(%esp),%esp; \
27 + movl SYSENTER_stack_esp0+offset(%esp),%esp; \
28 pushfl; \
29 pushl $__KERNEL_CS; \
30 pushl $sysenter_past_esp