diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-03-08 19:11:47 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-03-08 19:11:47 +0000 |
| commit | 4b95ad776cde673455bacae85ac93c40bf09fcb7 (patch) | |
| tree | fc71b3cf4d88d3b00d7c2011bda937424436ff17 | |
| parent | 41386785496933ca367270cb3b19674b0b8790e4 (diff) | |
| download | xen-4b95ad776cde673455bacae85ac93c40bf09fcb7.tar.gz xen-4b95ad776cde673455bacae85ac93c40bf09fcb7.tar.bz2 xen-4b95ad776cde673455bacae85ac93c40bf09fcb7.zip | |
x86: a little bit of cleanup
Signed-off-by: Jan Beulich <jbeulich@novell.com>
| -rw-r--r-- | xen/arch/x86/io_apic.c | 12 | ||||
| -rw-r--r-- | xen/arch/x86/irq.c | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index d99d3cee40..977d939ca0 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -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 --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 08dfd76960..c0b4f2289d 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -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; |