2 files changed, 58 insertions, 0 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 3b7aa38254a8..9318dee22537 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -108,6 +108,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
@@ -129,6 +156,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".
 
@@ -179,6 +207,10 @@ config IA64_HP_SIM
         bool "Ski-simulator"
         select SWIOTLB
 
+config IA64_XEN_GUEST
+        bool "Xen guest"
+        depends on XEN
+
 endchoice
 
 choice
diff --git a/arch/ia64/xen/Kconfig b/arch/ia64/xen/Kconfig
new file mode 100644
index 000000000000..f1683a20275b
--- /dev/null
+++ b/arch/ia64/xen/Kconfig
@@ -0,0 +1,26 @@
+#
+# This Kconfig describes xen/ia64 options
+#
+
+config XEN
+        bool "Xen hypervisor support"
+        default y
+        depends on PARAVIRT && MCKINLEY && IA64_PAGE_SIZE_16KB && EXPERIMENTAL
+        select XEN_XENCOMM
+        select NO_IDLE_HZ
+
+        # those are required to save/restore.
+        select ARCH_SUSPEND_POSSIBLE
+        select SUSPEND
+        select PM_SLEEP
+        help
+          Enable Xen hypervisor support.  Resulting kernel runs
+          both as a guest OS on Xen and natively on hardware.
+
+config XEN_XENCOMM
+        depends on XEN
+        bool
+
+config NO_IDLE_HZ
+        depends on XEN
+        bool