[Xen-changelog] [linux-2.6.18-xen] [IA64] Minor cleanup of hypervisor.h to removed one #ifdef.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1192220344 21600
# Node ID 20a6ec064afc6ca1a88b2bd548ed142d1aac69c1
# Parent  7334d4ad4b526e5124d31c448586fa4da9d186f9
[IA64] Minor cleanup of hypervisor.h to removed one #ifdef.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 include/asm-ia64/hypervisor.h |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff -r 7334d4ad4b52 -r 20a6ec064afc include/asm-ia64/hypervisor.h
--- a/include/asm-ia64/hypervisor.h     Thu Oct 11 16:03:24 2007 +0100
+++ b/include/asm-ia64/hypervisor.h     Fri Oct 12 14:19:04 2007 -0600
@@ -140,12 +140,6 @@ int privcmd_mmap(struct file * file, str
 #define        pte_mfn(_x)     pte_pfn(_x)
 #define phys_to_machine_mapping_valid(_x)      (1)
 
-#endif /* !CONFIG_VMX_GUEST */
-
-#define __pte_ma(_x)   ((pte_t) {(_x)})        /* unmodified use */
-#define pfn_pte_ma(_x,_y)      __pte_ma(0)     /* unmodified use */
-
-#ifndef CONFIG_VMX_GUEST
 void xen_contiguous_bitmap_init(unsigned long end_pfn);
 int __xen_create_contiguous_region(unsigned long vstart, unsigned int order, 
unsigned int address_bits);
 static inline int
@@ -177,6 +171,9 @@ int xen_limit_pages_to_max_mfn(struct pa
 #define HAVE_XEN_POST_SUSPEND
 void xen_post_suspend(int suspend_cancelled);
 #endif /* !CONFIG_VMX_GUEST */
+
+#define __pte_ma(_x)   ((pte_t) {(_x)})        /* unmodified use */
+#define pfn_pte_ma(_x,_y)      __pte_ma(0)     /* unmodified use */
 
 // for netfront.c, netback.c
 #define MULTI_UVMFLAGS_INDEX 0 //XXX any value

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog