Commit 36704263f1f466f7eb6f237e97f4ec15473980fc
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
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
Showing 2 changed files Side-by-side Diff
arch/x86/xen/smp.c
| ... | ... | @@ -278,6 +278,15 @@ |
| 278 | 278 | old memory can be recycled */ |
| 279 | 279 | make_lowmem_page_readwrite(xen_initial_gdt); |
| 280 | 280 | |
| 281 | +#ifdef CONFIG_X86_32 | |
| 282 | + /* | |
| 283 | + * Xen starts us with XEN_FLAT_RING1_DS, but linux code | |
| 284 | + * expects __USER_DS | |
| 285 | + */ | |
| 286 | + loadsegment(ds, __USER_DS); | |
| 287 | + loadsegment(es, __USER_DS); | |
| 288 | +#endif | |
| 289 | + | |
| 281 | 290 | xen_filter_cpu_maps(); |
| 282 | 291 | xen_setup_vcpu_info_placement(); |
| 283 | 292 | } |
drivers/char/tpm/xen-tpmfront.c