projects
/
linux
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux]
/
arch
/
x86
/
xen
/
enlighten_pv.c
diff --git
a/arch/x86/xen/enlighten_pv.c
b/arch/x86/xen/enlighten_pv.c
index
168efb2
..
fbd054d
100644
(file)
--- a/
arch/x86/xen/enlighten_pv.c
+++ b/
arch/x86/xen/enlighten_pv.c
@@
-601,7
+601,7
@@
static struct trap_array_entry trap_array[] = {
#ifdef CONFIG_X86_MCE
{ machine_check, xen_machine_check, true },
#endif
#ifdef CONFIG_X86_MCE
{ machine_check, xen_machine_check, true },
#endif
- { nmi, xen_
nmi,
true },
+ { nmi, xen_
xennmi,
true },
{ overflow, xen_overflow, false },
#ifdef CONFIG_IA32_EMULATION
{ entry_INT80_compat, xen_entry_INT80_compat, false },
{ overflow, xen_overflow, false },
#ifdef CONFIG_IA32_EMULATION
{ entry_INT80_compat, xen_entry_INT80_compat, false },
@@
-811,15
+811,14
@@
static void __init xen_write_gdt_entry_boot(struct desc_struct *dt, int entry,
}
}
}
}
-static void xen_load_sp0(struct tss_struct *tss,
- struct thread_struct *thread)
+static void xen_load_sp0(unsigned long sp0)
{
struct multicall_space mcs;
mcs = xen_mc_entry(0);
{
struct multicall_space mcs;
mcs = xen_mc_entry(0);
- MULTI_stack_switch(mcs.mc, __KERNEL_DS,
thread->
sp0);
+ MULTI_stack_switch(mcs.mc, __KERNEL_DS, sp0);
xen_mc_issue(PARAVIRT_LAZY_CPU);
xen_mc_issue(PARAVIRT_LAZY_CPU);
- t
ss->x86_tss.sp0 = thread->sp0
;
+ t
his_cpu_write(cpu_tss.x86_tss.sp0, sp0)
;
}
void xen_set_iopl_mask(unsigned mask)
}
void xen_set_iopl_mask(unsigned mask)