1.1 --- a/xen/include/asm-ia64/linux-xen/asm/pgtable.h	Mon Oct 02 21:39:44 2006 -0600
     1.2 +++ b/xen/include/asm-ia64/linux-xen/asm/pgtable.h	Mon Oct 02 21:42:59 2006 -0600
     1.3 @@ -68,6 +68,20 @@
     1.4  #ifdef XEN
     1.5  #define _PAGE_VIRT_D		(__IA64_UL(1) << 53)	/* Virtual dirty bit */
     1.6  #define _PAGE_PROTNONE		0
     1.7 +
     1.8 +/* domVTI */
     1.9 +#define GPFN_MEM		(0UL << 60)	/* Guest pfn is normal mem */
    1.10 +#define GPFN_FRAME_BUFFER	(1UL << 60)	/* VGA framebuffer */
    1.11 +#define GPFN_LOW_MMIO		(2UL << 60)	/* Low MMIO range */
    1.12 +#define GPFN_PIB		(3UL << 60)	/* PIB base */
    1.13 +#define GPFN_IOSAPIC		(4UL << 60)	/* IOSAPIC base */
    1.14 +#define GPFN_LEGACY_IO		(5UL << 60)	/* Legacy I/O base */
    1.15 +#define GPFN_GFW		(6UL << 60)	/* Guest Firmware */
    1.16 +#define GPFN_HIGH_MMIO		(7UL << 60)	/* High MMIO range */
    1.17 +
    1.18 +#define GPFN_IO_MASK		(7UL << 60)	/* Guest pfn is I/O type */
    1.19 +#define GPFN_INV_MASK		(1UL << 63)	/* Guest pfn is invalid */
    1.20 +
    1.21  #else
    1.22  #define _PAGE_PROTNONE		(__IA64_UL(1) << 63)
    1.23  #endif

     2.1 --- a/xen/include/public/arch-ia64.h	Mon Oct 02 21:39:44 2006 -0600
     2.2 +++ b/xen/include/public/arch-ia64.h	Mon Oct 02 21:42:59 2006 -0600
     2.3 @@ -48,18 +48,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
     2.4  
     2.5  typedef unsigned long xen_ulong_t;
     2.6  
     2.7 -#define GPFN_MEM          (0UL << 56) /* Guest pfn is normal mem */
     2.8 -#define GPFN_FRAME_BUFFER (1UL << 56) /* VGA framebuffer */
     2.9 -#define GPFN_LOW_MMIO     (2UL << 56) /* Low MMIO range */
    2.10 -#define GPFN_PIB          (3UL << 56) /* PIB base */
    2.11 -#define GPFN_IOSAPIC      (4UL << 56) /* IOSAPIC base */
    2.12 -#define GPFN_LEGACY_IO    (5UL << 56) /* Legacy I/O base */
    2.13 -#define GPFN_GFW          (6UL << 56) /* Guest Firmware */
    2.14 -#define GPFN_HIGH_MMIO    (7UL << 56) /* High MMIO range */
    2.15 -
    2.16 -#define GPFN_IO_MASK     (7UL << 56)  /* Guest pfn is I/O type */
    2.17 -#define GPFN_INV_MASK    (31UL << 59) /* Guest pfn is invalid */
    2.18 -
    2.19  #define INVALID_MFN       (~0UL)
    2.20  
    2.21  #define MEM_G   (1UL << 30)