[Xen-changelog] Merge djm@xxxxxxxxxxxxxxxxxxx:/home/djm/xeno-unstable-ia64.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1709.1.9, 2005/06/15 10:27:06-06:00, djm@xxxxxxxxxxxxxxx

        Merge djm@xxxxxxxxxxxxxxxxxxx:/home/djm/xeno-unstable-ia64.bk
        into kirby.fc.hp.com:/home/djm/src/xen/xeno-unstable-ia64.bk



 vcpu.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


diff -Nru a/xen/arch/ia64/vcpu.c b/xen/arch/ia64/vcpu.c
--- a/xen/arch/ia64/vcpu.c      2005-06-19 14:04:40 -04:00
+++ b/xen/arch/ia64/vcpu.c      2005-06-19 14:04:40 -04:00
@@ -539,7 +539,7 @@
     } else
 #endif // CONFIG_VTI
     {
-       if (!test_bit(vector,PSCB(vcpu,delivery_mask))) return;
+       /* if (!test_bit(vector,PSCB(vcpu,delivery_mask))) return; */
        if (test_bit(vector,PSCBX(vcpu,irr))) {
 //printf("vcpu_pend_interrupt: overrun\n");
        }
@@ -569,10 +569,10 @@
        UINT64 *p, *q, *r, bits, bitnum, mask, i, vector;
 
        p = &PSCBX(vcpu,irr[3]);
-       q = &PSCB(vcpu,delivery_mask[3]);
+       /* q = &PSCB(vcpu,delivery_mask[3]); */
        r = &PSCBX(vcpu,insvc[3]);
        for (i = 3; ; p--, q--, r--, i--) {
-               bits = *p & *q;
+               bits = *p /* & *q */;
                if (bits) break; // got a potential interrupt
                if (*r) {
                        // nothing in this word which is pending+inservice

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog