xen-changelog

[Top] [All Lists]

[Xen-changelog] [xen-unstable] x86/HPET: fix oversight in 23033:84bacd80

from [Xen patchbot-unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] [xen-unstable] x86/HPET: fix oversight in 23033:84bacd800bf8
From:	Xen patchbot-unstable <patchbot@xxxxxxx>
Date:	Sun, 20 Mar 2011 06:40:19 +0000
Delivery-date:	Sat, 19 Mar 2011 23:42:10 -0700
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
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/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/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 Jan Beulich <jbeulich@xxxxxxxxxx>
# Date 1300183356 0
# Node ID 599ceb5b0a9b014cf609e4c9e54c54c51b3217e5
# Parent  9f6dec0d25cdef647b60286b99e8beb39b4d91cd
x86/HPET: fix oversight in 23033:84bacd800bf8

Clearly for the adjusted BUG_ON()s to not yield false positives
num_chs_used must be incremented before setting up an IRQ (and
decremented back when the setup failed).

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---


diff -r 9f6dec0d25cd -r 599ceb5b0a9b xen/arch/x86/hpet.c
--- a/xen/arch/x86/hpet.c       Mon Mar 14 17:20:11 2011 +0000
+++ b/xen/arch/x86/hpet.c       Tue Mar 15 10:02:36 2011 +0000
@@ -428,10 +428,8 @@
         ch->flags = 0;
         ch->idx = i;
 
-        if ( (ch->irq = hpet_assign_irq(num_chs_used)) < 0 )
-            continue;
-
-        num_chs_used++;
+        if ( (ch->irq = hpet_assign_irq(num_chs_used++)) < 0 )
+            num_chs_used--;
     }
 
     printk(XENLOG_INFO "HPET: %u timers (%u will be used for broadcast)\n",

_______________________________________________
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] x86/HPET: fix oversight in 23033:84bacd800bf8, Xen patchbot-unstable <=

Previous by Date:	[Xen-changelog] [xen-unstable] _csched_cpu_pick(): simplify sched_smt_power_savings dependent condition, Xen patchbot-unstable
Next by Date:	[Xen-changelog] [xen-unstable] Avoid endless loop for vcpu migration., Xen patchbot-unstable
Previous by Thread:	[Xen-changelog] [xen-unstable] _csched_cpu_pick(): simplify sched_smt_power_savings dependent condition, Xen patchbot-unstable
Next by Thread:	[Xen-changelog] [xen-unstable] Avoid endless loop for vcpu migration., Xen patchbot-unstable
Indexes:	[Date] [Thread] [Top] [All Lists]