Merge commit 'v2.6.28-rc2' into x86/uv

1 files changed, 31 insertions, 0 deletions

diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c
index 94c44b1ccfd0..742dbb1d5a4f 100644
--- a/arch/ia64/kernel/asm-offsets.c
+++ b/arch/ia64/kernel/asm-offsets.c
@@ -16,6 +16,9 @@
 #include <asm/sigcontext.h>
 #include <asm/mca.h>
 
+#include <asm/xen/interface.h>
+#include <asm/xen/hypervisor.h>
+
 #include "../kernel/sigframe.h"
 #include "../kernel/fsyscall_gtod_data.h"
 
@@ -286,4 +289,32 @@ void foo(void)
                 offsetof (struct itc_jitter_data_t, itc_jitter));
         DEFINE(IA64_ITC_LASTCYCLE_OFFSET,
                 offsetof (struct itc_jitter_data_t, itc_lastcycle));
+
+#ifdef CONFIG_XEN
+        BLANK();
+
+        DEFINE(XEN_NATIVE_ASM, XEN_NATIVE);
+        DEFINE(XEN_PV_DOMAIN_ASM, XEN_PV_DOMAIN);
+
+#define DEFINE_MAPPED_REG_OFS(sym, field) \
+        DEFINE(sym, (XMAPPEDREGS_OFS + offsetof(struct mapped_regs, field)))
+
+        DEFINE_MAPPED_REG_OFS(XSI_PSR_I_ADDR_OFS, interrupt_mask_addr);
+        DEFINE_MAPPED_REG_OFS(XSI_IPSR_OFS, ipsr);
+        DEFINE_MAPPED_REG_OFS(XSI_IIP_OFS, iip);
+        DEFINE_MAPPED_REG_OFS(XSI_IFS_OFS, ifs);
+        DEFINE_MAPPED_REG_OFS(XSI_PRECOVER_IFS_OFS, precover_ifs);
+        DEFINE_MAPPED_REG_OFS(XSI_ISR_OFS, isr);
+        DEFINE_MAPPED_REG_OFS(XSI_IFA_OFS, ifa);
+        DEFINE_MAPPED_REG_OFS(XSI_IIPA_OFS, iipa);
+        DEFINE_MAPPED_REG_OFS(XSI_IIM_OFS, iim);
+        DEFINE_MAPPED_REG_OFS(XSI_IHA_OFS, iha);
+        DEFINE_MAPPED_REG_OFS(XSI_ITIR_OFS, itir);
+        DEFINE_MAPPED_REG_OFS(XSI_PSR_IC_OFS, interrupt_collection_enabled);
+        DEFINE_MAPPED_REG_OFS(XSI_BANKNUM_OFS, banknum);
+        DEFINE_MAPPED_REG_OFS(XSI_BANK0_R16_OFS, bank0_regs[0]);
+        DEFINE_MAPPED_REG_OFS(XSI_BANK1_R16_OFS, bank1_regs[0]);
+        DEFINE_MAPPED_REG_OFS(XSI_B0NATS_OFS, vbnat);
+        DEFINE_MAPPED_REG_OFS(XSI_B1NATS_OFS, vnat);
+#endif /* CONFIG_XEN */
 }