1.1 --- a/xen/arch/x86/irq.c	Tue Jun 23 11:10:29 2009 +0100
     1.2 +++ b/xen/arch/x86/irq.c	Tue Jun 23 11:11:46 2009 +0100
     1.3 @@ -84,15 +84,9 @@ int assign_irq_vector(int irq)
     1.4  
     1.5      spin_lock(&vector_lock);
     1.6  
     1.7 -    if ((irq != AUTO_ASSIGN_IRQ) && !IO_APIC_IRQ(irq))
     1.8 -    {
     1.9 +    if ((irq != AUTO_ASSIGN_IRQ) && (irq_to_vector(irq) > 0)) {
    1.10          spin_unlock(&vector_lock);
    1.11 -        return LEGACY_VECTOR(irq);
    1.12 -    }
    1.13 -
    1.14 -    if ((irq != AUTO_ASSIGN_IRQ) && (IO_APIC_VECTOR(irq) > 0)) {
    1.15 -        spin_unlock(&vector_lock);
    1.16 -        return IO_APIC_VECTOR(irq);
    1.17 +        return irq_to_vector(irq);
    1.18      }
    1.19  
    1.20      vector = current_vector;