x86: some assorted irq related cleanups

Signed-off-by: Jan Beulich <jbeulich@novell.com>

6 files changed, 2 insertions, 19 deletions

diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index f99907439e..fe281d4c4e 100644
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -1781,7 +1781,7 @@ static inline void check_timer(void)
 
 static struct IO_APIC_route_entry *ioapic_pm_state;
 
-void ioapic_pm_state_alloc(void)
+static void __init ioapic_pm_state_alloc(void)
 {
     int i, nr_entry = 0;
 
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 57b3c59a20..e4f641f86e 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -844,7 +844,7 @@ void pirq_guest_unbind(struct domain *d, int irq)
         xfree(oldaction);
 }
 
-int pirq_guest_force_unbind(struct domain *d, int irq)
+static int pirq_guest_force_unbind(struct domain *d, int irq)
 {
     irq_desc_t *desc;
     irq_guest_action_t *action, *oldaction = NULL;
diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c
index 4774431204..5ca5f16eaf 100644
--- a/xen/drivers/passthrough/amd/iommu_intr.c
+++ b/xen/drivers/passthrough/amd/iommu_intr.c
@@ -108,9 +108,6 @@ static void update_intremap_entry_from_ioapic(
     return;
 }
 
-extern int nr_ioapic_registers[MAX_IO_APICS];
-extern int nr_ioapics;
-
 int __init amd_iommu_setup_intremap_table(void)
 {
     struct IO_APIC_route_entry rte = {0};
diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h
index eaa77a8d79..af34aff979 100644
--- a/xen/include/asm-x86/io_apic.h
+++ b/xen/include/asm-x86/io_apic.h
@@ -167,12 +167,6 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned
 /* 1 if "noapic" boot option passed */
 extern int skip_ioapic_setup;
 
-/*
- * If we use the IO-APIC for IRQ routing, disable automatic
- * assignment of PCI IRQ's.
- */
-#define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs)
-
 #ifdef CONFIG_ACPI_BOOT
 extern int io_apic_get_unique_id (int ioapic, int apic_id);
 extern int io_apic_get_version (int ioapic);
@@ -186,7 +180,6 @@ extern void ioapic_suspend(void);
 extern void ioapic_resume(void);
 
 #else  /* !CONFIG_X86_IO_APIC */
-#define io_apic_assign_pci_irqs 0
 static inline void ioapic_suspend(void) {}
 static inline void ioapic_resume(void) {}
 #endif
diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h
index 108b065d17..c57803d4a3 100644
--- a/xen/include/asm-x86/irq.h
+++ b/xen/include/asm-x86/irq.h
@@ -64,6 +64,4 @@ void free_domain_pirqs(struct domain *d);
                                        (vec) > LAST_LEGACY_VECTOR) ? \
                                       0 : LEGACY_IRQ_FROM_VECTOR(vec))
 
-int pirq_guest_force_unbind(struct domain *d, int irq);
-
 #endif /* _ASM_HW_IRQ_H */
diff --git a/xen/include/asm-x86/mach-default/smpboot_hooks.h b/xen/include/asm-x86/mach-default/smpboot_hooks.h
index 48e589e018..a70d279912 100644
--- a/xen/include/asm-x86/mach-default/smpboot_hooks.h
+++ b/xen/include/asm-x86/mach-default/smpboot_hooks.h
@@ -1,11 +1,6 @@
 /* two abstractions specific to kernel/smpboot.c, mainly to cater to visws
  * which needs to alter them. */
 
-static inline void smpboot_clear_io_apic_irqs(void)
-{
-	io_apic_irqs = 0;
-}
-
 static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
 {
 	CMOS_WRITE(0xa, 0xf);