# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Date 1159844230 -32400
# Node ID b904644795555100c0f240d720a517a38a4276af
# Parent  dfb7cbcad569ac2028ff3fadfa6e07f84bd7e48e
don't export GPFN_xxx flags.
GPFN_INV_MASK taks 4bits, but 1 bit is sufficient.
PATCHNAME: gpfn_mask

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r dfb7cbcad569 -r b90464479555 xen/include/asm-ia64/linux-xen/asm/pgtable.h
--- a/xen/include/asm-ia64/linux-xen/asm/pgtable.h	Thu Aug 24 16:47:11 2006 +0900
+++ b/xen/include/asm-ia64/linux-xen/asm/pgtable.h	Tue Oct 03 11:57:10 2006 +0900
@@ -68,6 +68,20 @@
 #ifdef XEN
 #define _PAGE_VIRT_D		(__IA64_UL(1) << 53)	/* Virtual dirty bit */
 #define _PAGE_PROTNONE		0
+
+/* domVTI */
+#define GPFN_MEM		(0UL << 60)	/* Guest pfn is normal mem */
+#define GPFN_FRAME_BUFFER	(1UL << 60)	/* VGA framebuffer */
+#define GPFN_LOW_MMIO		(2UL << 60)	/* Low MMIO range */
+#define GPFN_PIB		(3UL << 60)	/* PIB base */
+#define GPFN_IOSAPIC		(4UL << 60)	/* IOSAPIC base */
+#define GPFN_LEGACY_IO		(5UL << 60)	/* Legacy I/O base */
+#define GPFN_GFW		(6UL << 60)	/* Guest Firmware */
+#define GPFN_HIGH_MMIO		(7UL << 60)	/* High MMIO range */
+
+#define GPFN_IO_MASK		(7UL << 60)	/* Guest pfn is I/O type */
+#define GPFN_INV_MASK		(1UL << 63)	/* Guest pfn is invalid */
+
 #else
 #define _PAGE_PROTNONE		(__IA64_UL(1) << 63)
 #endif
diff -r dfb7cbcad569 -r b90464479555 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h	Thu Aug 24 16:47:11 2006 +0900
+++ b/xen/include/public/arch-ia64.h	Tue Oct 03 11:57:10 2006 +0900
@@ -47,18 +47,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
 #ifndef __ASSEMBLY__
 
 typedef unsigned long xen_ulong_t;
-
-#define GPFN_MEM          (0UL << 56) /* Guest pfn is normal mem */
-#define GPFN_FRAME_BUFFER (1UL << 56) /* VGA framebuffer */
-#define GPFN_LOW_MMIO     (2UL << 56) /* Low MMIO range */
-#define GPFN_PIB          (3UL << 56) /* PIB base */
-#define GPFN_IOSAPIC      (4UL << 56) /* IOSAPIC base */
-#define GPFN_LEGACY_IO    (5UL << 56) /* Legacy I/O base */
-#define GPFN_GFW          (6UL << 56) /* Guest Firmware */
-#define GPFN_HIGH_MMIO    (7UL << 56) /* High MMIO range */
-
-#define GPFN_IO_MASK     (7UL << 56)  /* Guest pfn is I/O type */
-#define GPFN_INV_MASK    (31UL << 59) /* Guest pfn is invalid */
 
 #define INVALID_MFN       (~0UL)