[Xen-changelog] [xen-unstable] [IA64] don't export GPFN_xxx flags.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 5727c3c4070ec5391b53c20a953af5259653629f
# Parent  0c7e58ba4fbd48dae1d51aa80384db25d1eb57b7
[IA64] don't export GPFN_xxx flags.

GPFN_INV_MASK takes 4 bits, but 1 bit is sufficient.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/include/asm-ia64/linux-xen/asm/pgtable.h |   14 ++++++++++++++
 xen/include/public/arch-ia64.h               |   12 ------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff -r 0c7e58ba4fbd -r 5727c3c4070e 
xen/include/asm-ia64/linux-xen/asm/pgtable.h
--- a/xen/include/asm-ia64/linux-xen/asm/pgtable.h      Mon Oct 02 21:39:44 
2006 -0600
+++ b/xen/include/asm-ia64/linux-xen/asm/pgtable.h      Mon Oct 02 21:42:59 
2006 -0600
@@ -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 0c7e58ba4fbd -r 5727c3c4070e xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h    Mon Oct 02 21:39:44 2006 -0600
+++ b/xen/include/public/arch-ia64.h    Mon Oct 02 21:42:59 2006 -0600
@@ -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)
 

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