# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID f4b83d04643cbab10b9f31ba85ef01d2d6702b45
# Parent 8ee4d4dac5520306da660a475b319ae9eb2f71d5
[IA64] 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 8ee4d4dac552 -r f4b83d04643c xen/arch/ia64/asm-xsi-offsets.c
--- a/xen/arch/ia64/asm-xsi-offsets.c Tue Feb 28 19:02:50 2006
+++ b/xen/arch/ia64/asm-xsi-offsets.c Tue Feb 28 19:23:46 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 8ee4d4dac552 -r f4b83d04643c xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c Tue Feb 28 19:02:50 2006
+++ b/xen/arch/ia64/xen/domain.c Tue Feb 28 19:23:46 2006
@@ -974,13 +974,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 8ee4d4dac552 -r f4b83d04643c xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c Tue Feb 28 19:02:50 2006
+++ b/xen/arch/ia64/xen/vcpu.c Tue Feb 28 19:23:46 2006
@@ -651,7 +651,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");
}
@@ -691,7 +690,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 */;
@@ -994,7 +992,6 @@
vcpu_set_next_timer(vcpu);
printf("vcpu_enable_timer: interval set to %lu 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 8ee4d4dac552 -r f4b83d04643c xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h Tue Feb 28 19:02:50 2006
+++ b/xen/include/public/arch-ia64.h Tue Feb 28 19:23:46 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
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home