Pull pv_ops-xen into release branch

1 files changed, 32 insertions, 0 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 892f296f99b6..239ad6b1c74f 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -109,6 +109,33 @@ config AUDIT_ARCH
         bool
         default y
 
+menuconfig PARAVIRT_GUEST
+        bool "Paravirtualized guest support"
+        help
+          Say Y here to get to see options related to running Linux under
+          various hypervisors.  This option alone does not add any kernel code.
+
+          If you say N, all options in this submenu will be skipped and disabled.
+
+if PARAVIRT_GUEST
+
+config PARAVIRT
+        bool "Enable paravirtualization code"
+        depends on PARAVIRT_GUEST
+        default y
+        bool
+        default y
+        help
+          This changes the kernel so it can modify itself when it is run
+          under a hypervisor, potentially improving performance significantly
+          over full virtualization.  However, when run without a hypervisor
+          the kernel is theoretically slower and slightly larger.
+
+
+source "arch/ia64/xen/Kconfig"
+
+endif
+
 choice
         prompt "System type"
         default IA64_GENERIC
@@ -130,6 +157,7 @@ config IA64_GENERIC
           SGI-SN2               For SGI Altix systems
           SGI-UV                For SGI UV systems
           Ski-simulator         For the HP simulator <http://www.hpl.hp.com/research/linux/ski/>
+          Xen-domU              For xen domU system
 
           If you don't know what to do, choose "generic".
 
@@ -180,6 +208,10 @@ config IA64_HP_SIM
         bool "Ski-simulator"
         select SWIOTLB
 
+config IA64_XEN_GUEST
+        bool "Xen guest"
+        depends on XEN
+
 endchoice
 
 choice