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

--- 2010-03-02.orig/xen/arch/x86/io_apic.c	2010-01-06 11:17:14.000000000 +0100
+++ 2010-03-02/xen/arch/x86/io_apic.c	2010-03-08 15:31:13.000000000 +0100
@@ -1658,15 +1658,7 @@ static void end_msi_irq(unsigned int irq
         ack_APIC_irq(); /* ACKTYPE_EOI */
 }
 
-static void shutdown_msi_irq(unsigned int irq)
-{
-    mask_msi_irq(irq);
-}
-
-static void set_msi_affinity_irq(unsigned int irq, cpumask_t cpu_mask)
-{
-    set_msi_affinity(irq, cpu_mask);
-}
+#define shutdown_msi_irq mask_msi_irq
 
 /*
  * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
@@ -1680,7 +1672,7 @@ hw_irq_controller pci_msi_type = {
     .disable    = mask_msi_irq,
     .ack        = ack_msi_irq,
     .end        = end_msi_irq,
-    .set_affinity   = set_msi_affinity_irq,
+    .set_affinity   = set_msi_affinity,
 };
 
 static inline void init_IO_APIC_traps(void)
--- 2010-03-02.orig/xen/arch/x86/irq.c	2010-03-02 09:23:24.000000000 +0100
+++ 2010-03-02/xen/arch/x86/irq.c	2010-03-08 15:29:55.000000000 +0100
@@ -42,7 +42,7 @@ int __read_mostly *irq_status = NULL;
 
 #define IRQ_VECTOR_UNASSIGNED (0)
 
-DECLARE_BITMAP(used_vectors, NR_VECTORS);
+static DECLARE_BITMAP(used_vectors, NR_VECTORS);
 
 struct irq_cfg __read_mostly *irq_cfg = NULL;