ia64/xen-unstable

changeset 16606:8f0cbfc478d6

Merge with ia64 tree.
author Keir Fraser <keir.fraser@citrix.com>
date Thu Dec 13 09:31:03 2007 +0000 (2007-12-13)
parents d90dbf72049c 2ebced8f8baf
children dad1f2974d29 a4fadcab5cb0
files
line diff
     1.1 --- a/xen/arch/x86/hvm/vpt.c	Wed Dec 12 10:50:03 2007 -0700
     1.2 +++ b/xen/arch/x86/hvm/vpt.c	Thu Dec 13 09:31:03 2007 +0000
     1.3 @@ -53,8 +53,8 @@ static int pt_irq_masked(struct periodic
     1.4      if ( pt->source == PTSRC_lapic )
     1.5      {
     1.6          struct vlapic *vlapic = vcpu_vlapic(v);
     1.7 -        return (vlapic_enabled(vlapic) &&
     1.8 -                !(vlapic_get_reg(vlapic, APIC_LVTT) & APIC_LVT_MASKED));
     1.9 +        return (!vlapic_enabled(vlapic) ||
    1.10 +                (vlapic_get_reg(vlapic, APIC_LVTT) & APIC_LVT_MASKED));
    1.11      }
    1.12  
    1.13      isa_irq = pt->irq;