xen-changelog

[Top] [All Lists]

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

from [Xen patchbot-unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] [xen-unstable] Merge with ia64 tree.
From:	Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Thu, 13 Dec 2007 08:40:12 -0800
Delivery-date:	Thu, 13 Dec 2007 08:40:24 -0800
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] [xen-unstable] Merge with ia64 tree., Xen patchbot-unstable <=

Previous by Date:	[Xen-changelog] [xen-unstable] [IA64] Fix TLB purge and reload for xen heap in MCA handler, Xen patchbot-unstable
Next by Date:	[Xen-changelog] [xen-unstable] merge with xen-unstable.hg (staging), Xen patchbot-unstable
Previous by Thread:	[Xen-changelog] [xen-unstable] [IA64] Fix TLB purge and reload for xen heap in MCA handler, Xen patchbot-unstable
Next by Thread:	[Xen-changelog] [xen-unstable] merge with xen-unstable.hg (staging), Xen patchbot-unstable
Indexes:	[Date] [Thread] [Top] [All Lists]