From 0b21ed383aa593349ab1ea155631e54ef985b39d Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Fri, 6 Nov 2009 11:11:43 +0900
Subject: [PATCH] --- yaml --- r: 174783 b: refs/heads/master c:
 5b5d94487d934be6b0aa966c9acbdf15b07ef627 h: refs/heads/master i:   174781:
 d10475c6b20361e5ed593a53c9b7d59c0dc90a04   174779:
 d0559ebc19a41d5b56ec4fc135f1e84f533e3e8a   174775:
 1163b96e943f76bc59b7dd396e3723ba311ec154   174767:
 c8341a47be3fbb891677790099b1a17851908f0d   174751:
 11e97430dacf0da657c783cdb619aa27a527988e   174719:
 54ce1bcd6db071e97c8b1bf2ecc53f24806f7904 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/ia64/include/asm/xen/hypervisor.h | 28 +-------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 928f0eba46df..87ad481abc74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b536e0b6164d8875b4a5bb66cc102dcf0badeba
+refs/heads/master: 5b5d94487d934be6b0aa966c9acbdf15b07ef627
diff --git a/trunk/arch/ia64/include/asm/xen/hypervisor.h b/trunk/arch/ia64/include/asm/xen/hypervisor.h
index 88afb54501e4..67455c2ed2b1 100644
--- a/trunk/arch/ia64/include/asm/xen/hypervisor.h
+++ b/trunk/arch/ia64/include/asm/xen/hypervisor.h
@@ -37,35 +37,9 @@
 #include <xen/interface/xen.h>
 #include <xen/interface/version.h>	/* to compile feature.c */
 #include <xen/features.h>		/* to comiple xen-netfront.c */
+#include <xen/xen.h>
 #include <asm/xen/hypercall.h>
 
-/* xen_domain_type is set before executing any C code by early_xen_setup */
-enum xen_domain_type {
-	XEN_NATIVE,	/* running on bare hardware */
-	XEN_PV_DOMAIN,	/* running in a PV domain */
-	XEN_HVM_DOMAIN,	/* running in a Xen hvm domain*/
-};
-
-#ifdef CONFIG_XEN
-extern enum xen_domain_type xen_domain_type;
-#else
-#define xen_domain_type		XEN_NATIVE
-#endif
-
-#define xen_domain()		(xen_domain_type != XEN_NATIVE)
-#define xen_pv_domain()		(xen_domain() &&			\
-				 xen_domain_type == XEN_PV_DOMAIN)
-#define xen_hvm_domain()	(xen_domain() &&			\
-				 xen_domain_type == XEN_HVM_DOMAIN)
-
-#ifdef CONFIG_XEN_DOM0
-#define xen_initial_domain()	(xen_pv_domain() &&			\
-				 (xen_start_info->flags & SIF_INITDOMAIN))
-#else
-#define xen_initial_domain()	(0)
-#endif
-
-
 #ifdef CONFIG_XEN
 extern struct shared_info *HYPERVISOR_shared_info;
 extern struct start_info *xen_start_info;