# HG changeset patch
# User tristan.gingold@xxxxxxxx
# Node ID c3f82be17d98100123bb8b5f62306820cdd3d6f2
# Parent  a220579c2aa8b579ae2019ca2133476c6482a0aa
delivery_mask removed (was unused).
The field was renamed in arch-ia64.h for backward compatibility with xen linux.

Signed-off-by: Tristan Gingold <tristan.gingold@xxxxxxxx>

diff -r a220579c2aa8 -r c3f82be17d98 xen/arch/ia64/asm-xsi-offsets.c
--- a/xen/arch/ia64/asm-xsi-offsets.c	Mon Feb 27 21:00:33 2006
+++ b/xen/arch/ia64/asm-xsi-offsets.c	Tue Feb 28 04:50:44 2006
@@ -84,8 +84,6 @@
 	DEFINE(XSI_PEND, (SHARED_ARCHINFO_ADDR+offsetof(mapped_regs_t, pending_interruption)));
 	DEFINE(XSI_INCOMPL_REGFR_OFS, offsetof(mapped_regs_t, incomplete_regframe));
 	DEFINE(XSI_INCOMPL_REGFR, (SHARED_ARCHINFO_ADDR+offsetof(mapped_regs_t, incomplete_regframe)));
-	DEFINE(XSI_DELIV_MASK0_OFS, offsetof(mapped_regs_t, delivery_mask[0]));
-	DEFINE(XSI_DELIV_MASK0, (SHARED_ARCHINFO_ADDR+offsetof(mapped_regs_t, delivery_mask[0])));
 	DEFINE(XSI_METAPHYS_OFS, offsetof(mapped_regs_t, metaphysical_mode));
 	DEFINE(XSI_METAPHYS, (SHARED_ARCHINFO_ADDR+offsetof(mapped_regs_t, metaphysical_mode)));
 
diff -r a220579c2aa8 -r c3f82be17d98 xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c	Mon Feb 27 21:00:33 2006
+++ b/xen/arch/ia64/xen/domain.c	Tue Feb 28 04:50:44 2006
@@ -965,13 +965,6 @@
 
 	// FIXME: Hack for keyboard input
 	serial_input_init();
-	if (d == dom0) {
-		VCPU(v, delivery_mask[0]) = -1L;
-		VCPU(v, delivery_mask[1]) = -1L;
-		VCPU(v, delivery_mask[2]) = -1L;
-		VCPU(v, delivery_mask[3]) = -1L;
-	}
-	else __set_bit(0x30, VCPU(v, delivery_mask));
 
 	return 0;
 }
diff -r a220579c2aa8 -r c3f82be17d98 xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c	Mon Feb 27 21:00:33 2006
+++ b/xen/arch/ia64/xen/vcpu.c	Tue Feb 28 04:50:44 2006
@@ -643,7 +643,6 @@
 	    set_bit(vector,VCPU(vcpu,irr));
     } else
     {
-	/* if (!test_bit(vector,PSCB(vcpu,delivery_mask))) return; */
 	if (test_bit(vector,PSCBX(vcpu,irr))) {
 //printf("vcpu_pend_interrupt: overrun\n");
 	}
@@ -683,7 +682,6 @@
 		vcpu_pend_interrupt(vcpu, vcpu->vcpu_info->arch.evtchn_vector);
 
 	p = &PSCBX(vcpu,irr[3]);
-	/* q = &PSCB(vcpu,delivery_mask[3]); */
 	r = &PSCBX(vcpu,insvc[3]);
 	for (i = 3; ; p--, q--, r--, i--) {
 		bits = *p /* & *q */;
@@ -985,7 +983,6 @@
     vcpu_set_next_timer(vcpu);
     printf("vcpu_enable_timer(%d): interval set to %d cycles\n",
              PSCBX(vcpu,xen_timer_interval));
-    __set_bit(PSCB(vcpu,itv), PSCB(vcpu,delivery_mask));
 }
 
 IA64FAULT vcpu_set_itv(VCPU *vcpu, UINT64 val)
diff -r a220579c2aa8 -r c3f82be17d98 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h	Mon Feb 27 21:00:33 2006
+++ b/xen/include/public/arch-ia64.h	Tue Feb 28 04:50:44 2006
@@ -249,7 +249,7 @@
             int interrupt_delivery_enabled; // virtual psr.i
             int pending_interruption;
             int incomplete_regframe; // see SDM vol2 6.8
-            unsigned long delivery_mask[4];
+            unsigned long reserved5_1[4];
             int metaphysical_mode; // 1 = use metaphys mapping, 0 = use virtual
             int banknum; // 0 or 1, which virtual register bank is active
             unsigned long rrs[8]; // region registers