1.1 --- a/xen/arch/ia64/asm-xsi-offsets.c	Tue Feb 28 12:02:50 2006 -0700
     1.2 +++ b/xen/arch/ia64/asm-xsi-offsets.c	Tue Feb 28 12:23:46 2006 -0700
     1.3 @@ -84,8 +84,6 @@ void foo(void)
     1.4  	DEFINE(XSI_PEND, (SHARED_ARCHINFO_ADDR+offsetof(mapped_regs_t, pending_interruption)));
     1.5  	DEFINE(XSI_INCOMPL_REGFR_OFS, offsetof(mapped_regs_t, incomplete_regframe));
     1.6  	DEFINE(XSI_INCOMPL_REGFR, (SHARED_ARCHINFO_ADDR+offsetof(mapped_regs_t, incomplete_regframe)));
     1.7 -	DEFINE(XSI_DELIV_MASK0_OFS, offsetof(mapped_regs_t, delivery_mask[0]));
     1.8 -	DEFINE(XSI_DELIV_MASK0, (SHARED_ARCHINFO_ADDR+offsetof(mapped_regs_t, delivery_mask[0])));
     1.9  	DEFINE(XSI_METAPHYS_OFS, offsetof(mapped_regs_t, metaphysical_mode));
    1.10  	DEFINE(XSI_METAPHYS, (SHARED_ARCHINFO_ADDR+offsetof(mapped_regs_t, metaphysical_mode)));
    1.11  

     2.1 --- a/xen/arch/ia64/xen/domain.c	Tue Feb 28 12:02:50 2006 -0700
     2.2 +++ b/xen/arch/ia64/xen/domain.c	Tue Feb 28 12:23:46 2006 -0700
     2.3 @@ -974,13 +974,6 @@ int construct_dom0(struct domain *d,
     2.4  
     2.5  	// FIXME: Hack for keyboard input
     2.6  	serial_input_init();
     2.7 -	if (d == dom0) {
     2.8 -		VCPU(v, delivery_mask[0]) = -1L;
     2.9 -		VCPU(v, delivery_mask[1]) = -1L;
    2.10 -		VCPU(v, delivery_mask[2]) = -1L;
    2.11 -		VCPU(v, delivery_mask[3]) = -1L;
    2.12 -	}
    2.13 -	else __set_bit(0x30, VCPU(v, delivery_mask));
    2.14  
    2.15  	return 0;
    2.16  }

     3.1 --- a/xen/arch/ia64/xen/vcpu.c	Tue Feb 28 12:02:50 2006 -0700
     3.2 +++ b/xen/arch/ia64/xen/vcpu.c	Tue Feb 28 12:23:46 2006 -0700
     3.3 @@ -651,7 +651,6 @@ void vcpu_pend_interrupt(VCPU *vcpu, UIN
     3.4  	    set_bit(vector,VCPU(vcpu,irr));
     3.5      } else
     3.6      {
     3.7 -	/* if (!test_bit(vector,PSCB(vcpu,delivery_mask))) return; */
     3.8  	if (test_bit(vector,PSCBX(vcpu,irr))) {
     3.9  //printf("vcpu_pend_interrupt: overrun\n");
    3.10  	}
    3.11 @@ -691,7 +690,6 @@ check_start:
    3.12  		vcpu_pend_interrupt(vcpu, vcpu->vcpu_info->arch.evtchn_vector);
    3.13  
    3.14  	p = &PSCBX(vcpu,irr[3]);
    3.15 -	/* q = &PSCB(vcpu,delivery_mask[3]); */
    3.16  	r = &PSCBX(vcpu,insvc[3]);
    3.17  	for (i = 3; ; p--, q--, r--, i--) {
    3.18  		bits = *p /* & *q */;
    3.19 @@ -994,7 +992,6 @@ void vcpu_enable_timer(VCPU *vcpu,UINT64
    3.20      vcpu_set_next_timer(vcpu);
    3.21      printf("vcpu_enable_timer: interval set to %lu cycles\n",
    3.22               PSCBX(vcpu,xen_timer_interval));
    3.23 -    __set_bit(PSCB(vcpu,itv), PSCB(vcpu,delivery_mask));
    3.24  }
    3.25  
    3.26  IA64FAULT vcpu_set_itv(VCPU *vcpu, UINT64 val)

     4.1 --- a/xen/include/public/arch-ia64.h	Tue Feb 28 12:02:50 2006 -0700
     4.2 +++ b/xen/include/public/arch-ia64.h	Tue Feb 28 12:23:46 2006 -0700
     4.3 @@ -249,7 +249,7 @@ typedef struct {
     4.4              int interrupt_delivery_enabled; // virtual psr.i
     4.5              int pending_interruption;
     4.6              int incomplete_regframe; // see SDM vol2 6.8
     4.7 -            unsigned long delivery_mask[4];
     4.8 +            unsigned long reserved5_1[4];
     4.9              int metaphysical_mode; // 1 = use metaphys mapping, 0 = use virtual
    4.10              int banknum; // 0 or 1, which virtual register bank is active
    4.11              unsigned long rrs[8]; // region registers