[Xen-changelog] [xen-unstable] x86: a little bit of cleanup

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1268075507 0
# Node ID 2629c6a79d649a5173e1fa80b6ca61d9cbbb1818
# Parent  a02b1c791c9b954b66e0b225982088fd97e3422b
x86: a little bit of cleanup

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/arch/x86/io_apic.c |   12 ++----------
 xen/arch/x86/irq.c     |    2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff -r a02b1c791c9b -r 2629c6a79d64 xen/arch/x86/io_apic.c
--- a/xen/arch/x86/io_apic.c    Mon Mar 08 19:11:00 2010 +0000
+++ b/xen/arch/x86/io_apic.c    Mon Mar 08 19:11:47 2010 +0000
@@ -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)
diff -r a02b1c791c9b -r 2629c6a79d64 xen/arch/x86/irq.c
--- a/xen/arch/x86/irq.c        Mon Mar 08 19:11:00 2010 +0000
+++ b/xen/arch/x86/irq.c        Mon Mar 08 19:11:47 2010 +0000
@@ -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;
 

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