From: Alex Williamson <alex.williamson@hp.com>
Date: Tue, 30 Oct 2007 17:17:28 +0000 (-0600)
Subject: [IA64] Increase NITRS/NDTRS to 12
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14831
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3ddb3a23d8444543068ae792edfe349d9eeac64d;p=xen.git

[IA64] Increase NITRS/NDTRS to 12

Bump NITRS/NDTRS to 12.
(VMS needs at least 9 DTRS).

Signed-off-by: Tristan Gingold <tgingold@free.fr>
---

diff --git a/xen/include/asm-ia64/tlb.h b/xen/include/asm-ia64/tlb.h
index 4a70123945..3ccfaff397 100644
--- a/xen/include/asm-ia64/tlb.h
+++ b/xen/include/asm-ia64/tlb.h
@@ -1,8 +1,8 @@
 #ifndef XEN_ASM_IA64_TLB_H
 #define XEN_ASM_IA64_TLB_H
 
-#define	NITRS	8
-#define NDTRS	8
+#define NITRS	12
+#define NDTRS	12
 
 union pte_flags {
     struct {
diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h
index 511998bca0..02d2ebd005 100644
--- a/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@ -297,8 +297,8 @@ typedef struct ia64_tr_entry ia64_tr_entry_t;
 DEFINE_XEN_GUEST_HANDLE(ia64_tr_entry_t);
 
 struct vcpu_tr_regs {
-    struct ia64_tr_entry itrs[8];
-    struct ia64_tr_entry dtrs[8];
+    struct ia64_tr_entry itrs[12];
+    struct ia64_tr_entry dtrs[12];
 };
 
 union vcpu_ar_regs {
@@ -402,6 +402,7 @@ struct vcpu_guest_context_regs {
 
         /* Physical registers in case of debug event.  */
         unsigned long excp_iipa;
+        unsigned long excp_ifa;
         unsigned long excp_isr;
         unsigned int excp_vector;
 
@@ -421,7 +422,7 @@ struct vcpu_guest_context_regs {
 };
 
 struct vcpu_guest_context {
-#define VGCF_EXTRA_REGS (1UL << 1)	/* Get/Set extra regs.  */
+#define VGCF_EXTRA_REGS (1UL << 1)	/* Set extra regs.  */
     unsigned long flags;       /* VGCF_* flags */
 
     struct vcpu_guest_context_regs regs;
diff --git a/xen/include/public/foreign/reference.size b/xen/include/public/foreign/reference.size
index 853e8194ac..ead6cd1559 100644
--- a/xen/include/public/foreign/reference.size
+++ b/xen/include/public/foreign/reference.size
@@ -7,9 +7,9 @@ pt_fpreg                  |       -       -      16
 cpu_user_regs             |      68     200       -
 xen_ia64_boot_param       |       -       -      96
 ia64_tr_entry             |       -       -      32
-vcpu_tr_regs              |       -       -     512
-vcpu_guest_context_regs   |       -       -   21904
-vcpu_guest_context        |    2800    5168   21936
+vcpu_tr_regs              |       -       -     768
+vcpu_guest_context_regs   |       -       -   22176
+vcpu_guest_context        |    2800    5168   22208
 arch_vcpu_info            |      24      16       0
 vcpu_time_info            |      32      32      32
 vcpu_info                 |      64      64      48