diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-16 01:22:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-16 01:22:11 +0200 |
| commit | 36704263f1f466f7eb6f237e97f4ec15473980fc (patch) | |
| tree | 139b84f5859a16df53138e28bc79434fdf82f903 /arch | |
| parent | Merge tag 'vfio-v3.12-rc5' of git://github.com/awilliam/linux-vfio (diff) | |
| parent | xen: Fix possible user space selector corruption (diff) | |
| download | linux-36704263f1f466f7eb6f237e97f4ec15473980fc.tar.xz linux-36704263f1f466f7eb6f237e97f4ec15473980fc.zip | |
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')
| -rw-r--r-- | arch/x86/xen/smp.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index d1e4777b4e75..31d04758b76f 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(); } |