diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2007-12-13 09:31:03 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2007-12-13 09:31:03 +0000 |
| commit | 1710e13c26896b960ef038e3988f4a05aa3ad7f1 (patch) | |
| tree | a28c1ef9f621b69b06279494c57f55e3f842e5c3 | |
| parent | 26817e1c743126b426034999d1b32b047086fb14 (diff) | |
| parent | 5d3c70654cff15d02edcac6fa12817618af97f73 (diff) | |
| download | xen-1710e13c26896b960ef038e3988f4a05aa3ad7f1.tar.gz xen-1710e13c26896b960ef038e3988f4a05aa3ad7f1.tar.bz2 xen-1710e13c26896b960ef038e3988f4a05aa3ad7f1.zip | |
Merge with ia64 tree.
| -rw-r--r-- | xen/arch/x86/hvm/vpt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/arch/x86/hvm/vpt.c b/xen/arch/x86/hvm/vpt.c index 45c9350226..2879a66d55 100644 --- a/xen/arch/x86/hvm/vpt.c +++ b/xen/arch/x86/hvm/vpt.c @@ -53,8 +53,8 @@ static int pt_irq_masked(struct periodic_time *pt) 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; |