[Xen-changelog] [xen-unstable] Merge with ia64 tree.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1197538263 0
# Node ID 8f0cbfc478d627c89dfa2f76fccc65f614948953
# Parent  d90dbf72049c8a93fb868b392963e42b33b919b0
# Parent  2ebced8f8bafe196b5c6e7097d98d77e93e254af
Merge with ia64 tree.
---
 xen/arch/x86/hvm/vpt.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r d90dbf72049c -r 8f0cbfc478d6 xen/arch/x86/hvm/vpt.c
--- a/xen/arch/x86/hvm/vpt.c    Wed Dec 12 10:50:03 2007 -0700
+++ b/xen/arch/x86/hvm/vpt.c    Thu Dec 13 09:31:03 2007 +0000
@@ -53,8 +53,8 @@ static int pt_irq_masked(struct periodic
     if ( pt->source == PTSRC_lapic )
     {
         struct vlapic *vlapic = vcpu_vlapic(v);
-        return (vlapic_enabled(vlapic) &&
-                !(vlapic_get_reg(vlapic, APIC_LVTT) & APIC_LVT_MASKED));
+        return (!vlapic_enabled(vlapic) ||
+                (vlapic_get_reg(vlapic, APIC_LVTT) & APIC_LVT_MASKED));
     }
 
     isa_irq = pt->irq;

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