From: Alex Williamson <alex.williamson@hp.com>
Date: Wed, 7 Nov 2007 22:19:39 +0000 (-0700)
Subject: [IA64] Sync arch-ia64.h with Xen
X-Git-Tag: xen-3.2.0~21^2^2~28^2^2~22^2^2~9^2~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bc067bbfab5698ac6860e732edb83c123de09110;p=xenclient%2Fkernel.git

[IA64] Sync arch-ia64.h with Xen

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff --git a/include/xen/interface/arch-ia64.h b/include/xen/interface/arch-ia64.h
index 02d2ebd0..d197a79b 100644
--- a/include/xen/interface/arch-ia64.h
+++ b/include/xen/interface/arch-ia64.h
@@ -73,6 +73,12 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
 
 typedef unsigned long xen_ulong_t;
 
+#ifdef __XEN_TOOLS__
+#define XEN_PAGE_SIZE XC_PAGE_SIZE
+#else
+#define XEN_PAGE_SIZE PAGE_SIZE
+#endif
+
 #define INVALID_MFN       (~0UL)
 
 #define MEM_G   (1UL << 30)
@@ -93,16 +99,16 @@ typedef unsigned long xen_ulong_t;
 #define LEGACY_IO_SIZE   (64*MEM_M)
 
 #define IO_PAGE_START (LEGACY_IO_START + LEGACY_IO_SIZE)
-#define IO_PAGE_SIZE  PAGE_SIZE
+#define IO_PAGE_SIZE  XEN_PAGE_SIZE
 
 #define STORE_PAGE_START (IO_PAGE_START + IO_PAGE_SIZE)
-#define STORE_PAGE_SIZE  PAGE_SIZE
+#define STORE_PAGE_SIZE  XEN_PAGE_SIZE
 
-#define BUFFER_IO_PAGE_START (STORE_PAGE_START+STORE_PAGE_SIZE)
-#define BUFFER_IO_PAGE_SIZE PAGE_SIZE
+#define BUFFER_IO_PAGE_START (STORE_PAGE_START + STORE_PAGE_SIZE)
+#define BUFFER_IO_PAGE_SIZE  XEN_PAGE_SIZE
 
-#define BUFFER_PIO_PAGE_START (BUFFER_IO_PAGE_START+BUFFER_IO_PAGE_SIZE)
-#define BUFFER_PIO_PAGE_SIZE PAGE_SIZE
+#define BUFFER_PIO_PAGE_START (BUFFER_IO_PAGE_START + BUFFER_IO_PAGE_SIZE)
+#define BUFFER_PIO_PAGE_SIZE  XEN_PAGE_SIZE
 
 #define IO_SAPIC_START   0xfec00000UL
 #define IO_SAPIC_SIZE    0x100000
@@ -417,8 +423,14 @@ struct vcpu_guest_context_regs {
          */
         unsigned int rbs_voff;
         unsigned long rbs[2048];
-        unsigned long rbs_nat;
         unsigned long rbs_rnat;
+
+        /*
+         * RSE.N_STACKED_PHYS via PAL_RSE_INFO
+         * Strictly this isn't cpu context, but this value is necessary
+         * for domain save/restore. So is here.
+         */
+        unsigned long num_phys_stacked;
 };
 
 struct vcpu_guest_context {