1.1 --- a/xen/arch/x86/io_apic.c	Mon Mar 08 19:11:00 2010 +0000
     1.2 +++ b/xen/arch/x86/io_apic.c	Mon Mar 08 19:11:47 2010 +0000
     1.3 @@ -1658,15 +1658,7 @@ static void end_msi_irq(unsigned int irq
     1.4          ack_APIC_irq(); /* ACKTYPE_EOI */
     1.5  }
     1.6  
     1.7 -static void shutdown_msi_irq(unsigned int irq)
     1.8 -{
     1.9 -    mask_msi_irq(irq);
    1.10 -}
    1.11 -
    1.12 -static void set_msi_affinity_irq(unsigned int irq, cpumask_t cpu_mask)
    1.13 -{
    1.14 -    set_msi_affinity(irq, cpu_mask);
    1.15 -}
    1.16 +#define shutdown_msi_irq mask_msi_irq
    1.17  
    1.18  /*
    1.19   * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
    1.20 @@ -1680,7 +1672,7 @@ hw_irq_controller pci_msi_type = {
    1.21      .disable    = mask_msi_irq,
    1.22      .ack        = ack_msi_irq,
    1.23      .end        = end_msi_irq,
    1.24 -    .set_affinity   = set_msi_affinity_irq,
    1.25 +    .set_affinity   = set_msi_affinity,
    1.26  };
    1.27  
    1.28  static inline void init_IO_APIC_traps(void)

     2.1 --- a/xen/arch/x86/irq.c	Mon Mar 08 19:11:00 2010 +0000
     2.2 +++ b/xen/arch/x86/irq.c	Mon Mar 08 19:11:47 2010 +0000
     2.3 @@ -42,7 +42,7 @@ int __read_mostly *irq_status = NULL;
     2.4  
     2.5  #define IRQ_VECTOR_UNASSIGNED (0)
     2.6  
     2.7 -DECLARE_BITMAP(used_vectors, NR_VECTORS);
     2.8 +static DECLARE_BITMAP(used_vectors, NR_VECTORS);
     2.9  
    2.10  struct irq_cfg __read_mostly *irq_cfg = NULL;
    2.11