[Xen-changelog] [xen-unstable] x86: Another assign_irq_vector() cleanup.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1245751906 -3600
# Node ID 16c2806b09c63ebb354968a452546a6510fc11c2
# Parent  468561f3c8ee05cf5b2bcdc244741b359302f32b
x86: Another assign_irq_vector() cleanup.

Signed-off-by: Yunhong Jiang <yunhong.jiang@xxxxxxxxx>
---
 xen/arch/x86/irq.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff -r 468561f3c8ee -r 16c2806b09c6 xen/arch/x86/irq.c
--- a/xen/arch/x86/irq.c        Tue Jun 23 11:10:29 2009 +0100
+++ b/xen/arch/x86/irq.c        Tue Jun 23 11:11:46 2009 +0100
@@ -84,15 +84,9 @@ int assign_irq_vector(int irq)
 
     spin_lock(&vector_lock);
 
-    if ((irq != AUTO_ASSIGN_IRQ) && !IO_APIC_IRQ(irq))
-    {
+    if ((irq != AUTO_ASSIGN_IRQ) && (irq_to_vector(irq) > 0)) {
         spin_unlock(&vector_lock);
-        return LEGACY_VECTOR(irq);
-    }
-
-    if ((irq != AUTO_ASSIGN_IRQ) && (IO_APIC_VECTOR(irq) > 0)) {
-        spin_unlock(&vector_lock);
-        return IO_APIC_VECTOR(irq);
+        return irq_to_vector(irq);
     }
 
     vector = current_vector;

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