ia64/xen-unstable

view patches/linux-2.6.18/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch @ 14445:cb1693873a7e

libxc: Explicitly reserve space for special pages in HVM memmap.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Fri Mar 16 18:59:28 2007 +0000 (2007-03-16)
parents 3adf00179a63
children
line source
1 diff -pruN ../orig-linux-2.6.18/arch/i386/kernel/entry.S ./arch/i386/kernel/entry.S
2 --- ../orig-linux-2.6.18/arch/i386/kernel/entry.S 2006-09-20 04:42:06.000000000 +0100
3 +++ ./arch/i386/kernel/entry.S 2007-01-12 18:12:31.000000000 +0000
4 @@ -269,7 +269,7 @@ ENTRY(sysenter_entry)
5 CFI_STARTPROC simple
6 CFI_DEF_CFA esp, 0
7 CFI_REGISTER esp, ebp
8 - movl TSS_sysenter_esp0(%esp),%esp
9 + movl SYSENTER_stack_esp0(%esp),%esp
10 sysenter_past_esp:
11 /*
12 * No need to follow this irqs on/off section: the syscall
13 @@ -689,7 +689,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 @@ -701,7 +701,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