Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36704263 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1e52db69 7cde9b27

arch/x86/xen/smp.c

+9 −0
Original line number Diff line number Diff line
@@ -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();

	}

drivers/char/tpm/xen-tpmfront.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/errno.h>

#include <linux/err.h>

#include <linux/interrupt.h>

#include <xen/xen.h>

#include <xen/events.h>

#include <xen/interface/io/tpmif.h>

#include <xen/grant_table.h>