aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/x86_64/traps.c
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-07-13 11:31:08 +0100
committerKeir Fraser <keir.fraser@citrix.com>2009-07-13 11:31:08 +0100
commit0e20e0e1c7f61dbce3d1bbc64a280c9af92df3ce (patch)
tree460625478f0ccfb6e523485be963fda957ef8689 /xen/arch/x86/x86_64/traps.c
parent0759ea7379b67a00646ef6f71bda61d538891664 (diff)
downloadxen-0e20e0e1c7f61dbce3d1bbc64a280c9af92df3ce.tar.gz
xen-0e20e0e1c7f61dbce3d1bbc64a280c9af92df3ce.tar.bz2
xen-0e20e0e1c7f61dbce3d1bbc64a280c9af92df3ce.zip
x86: move init_tss into per-CPU space
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'xen/arch/x86/x86_64/traps.c')
-rw-r--r--xen/arch/x86/x86_64/traps.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
index 5773a1b22f..f458f491c7 100644
--- a/xen/arch/x86/x86_64/traps.c
+++ b/xen/arch/x86/x86_64/traps.c
@@ -433,13 +433,13 @@ void __devinit subarch_percpu_traps_init(void)
BUILD_BUG_ON((IST_MAX + 2) * PAGE_SIZE + PRIMARY_STACK_SIZE > STACK_SIZE);
/* Machine Check handler has its own per-CPU 4kB stack. */
- init_tss[cpu].ist[IST_MCE] = (unsigned long)&stack[IST_MCE * PAGE_SIZE];
+ this_cpu(init_tss).ist[IST_MCE] = (unsigned long)&stack[IST_MCE * PAGE_SIZE];
/* Double-fault handler has its own per-CPU 4kB stack. */
- init_tss[cpu].ist[IST_DF] = (unsigned long)&stack[IST_DF * PAGE_SIZE];
+ this_cpu(init_tss).ist[IST_DF] = (unsigned long)&stack[IST_DF * PAGE_SIZE];
/* NMI handler has its own per-CPU 4kB stack. */
- init_tss[cpu].ist[IST_NMI] = (unsigned long)&stack[IST_NMI * PAGE_SIZE];
+ this_cpu(init_tss).ist[IST_NMI] = (unsigned long)&stack[IST_NMI * PAGE_SIZE];
/* Trampoline for SYSCALL entry from long mode. */
stack = &stack[IST_MAX * PAGE_SIZE]; /* Skip the IST stacks. */