summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-15 16:22:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-15 16:22:11 -0700
commit36704263f1f466f7eb6f237e97f4ec15473980fc (patch)
tree139b84f5859a16df53138e28bc79434fdf82f903 /arch/x86
parent1e52db6908ca5aa8e035caeaf96e8de2567fd84d (diff)
parent7cde9b27e7b3a2e09d647bb4f6d94e842698d2d5 (diff)
downloadop-kernel-dev-36704263f1f466f7eb6f237e97f4ec15473980fc.zip
op-kernel-dev-36704263f1f466f7eb6f237e97f4ec15473980fc.tar.gz
Merge tag 'stable/for-linus-3.12-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen fixes from Stefano Stabellini: "A small fix for Xen on x86_32 and a build fix for xen-tpmfront on arm64" * tag 'stable/for-linus-3.12-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen: Fix possible user space selector corruption tpm: xen-tpmfront: fix missing declaration of xen_domain
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/xen/smp.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index d1e4777..31d0475 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -278,6 +278,15 @@ static void __init xen_smp_prepare_boot_cpu(void)
old memory can be recycled */
make_lowmem_page_readwrite(xen_initial_gdt);
+#ifdef CONFIG_X86_32
+ /*
+ * Xen starts us with XEN_FLAT_RING1_DS, but linux code
+ * expects __USER_DS
+ */
+ loadsegment(ds, __USER_DS);
+ loadsegment(es, __USER_DS);
+#endif
+
xen_filter_cpu_maps();
xen_setup_vcpu_info_placement();
}
OpenPOWER on IntegriCloud