From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Fri, 5 Feb 2016 12:10:04 +0000 (-0800)
Subject: Merge branch 'topic/uek-4.1/xen' of git://ca-git.us.oracle.com/chander-public.git... 
X-Git-Tag: v4.1.12-92~199
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ae9a8eda7896b1bb8714b9a77d90f00e251f701f;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/xen' of git://ca-git.us.oracle.com/chander-public.git into uek/uek-4.1

Conflicts:
	arch/x86/xen/enlighten.c
---

ae9a8eda7896b1bb8714b9a77d90f00e251f701f
diff --cc arch/x86/xen/Kconfig
index bab11c6d79c9e,005002d283890..a6736985e9f0a
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@@ -7,8 -7,9 +7,9 @@@ config XE
  	depends on PARAVIRT
  	select PARAVIRT_CLOCK
  	select XEN_HAVE_PVMMU
+ 	select XEN_HAVE_VPMU
  	depends on X86_64 || (X86_32 && X86_PAE)
 -	depends on X86_TSC
 +	depends on X86_LOCAL_APIC && X86_TSC
  	help
  	  This is the Linux Xen port.  Enabling this will allow the
  	  kernel to boot in a paravirtualized environment under the