[Xen-changelog] [xen-unstable] x86: some assorted irq related cleanups

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1242829836 -3600
# Node ID 1695a86b3d7c161a45dbc4b42446b07f87b281fc
# Parent  5369133d772c91512f0ae6e5a9381839d38de462
x86: some assorted irq related cleanups

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/arch/x86/io_apic.c                           |    2 +-
 xen/arch/x86/irq.c                               |    2 +-
 xen/drivers/passthrough/amd/iommu_intr.c         |    3 ---
 xen/include/asm-x86/io_apic.h                    |    7 -------
 xen/include/asm-x86/irq.h                        |    2 --
 xen/include/asm-x86/mach-default/smpboot_hooks.h |    5 -----
 6 files changed, 2 insertions(+), 19 deletions(-)

diff -r 5369133d772c -r 1695a86b3d7c xen/arch/x86/io_apic.c
--- a/xen/arch/x86/io_apic.c    Wed May 20 15:29:25 2009 +0100
+++ b/xen/arch/x86/io_apic.c    Wed May 20 15:30:36 2009 +0100
@@ -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 -r 5369133d772c -r 1695a86b3d7c xen/arch/x86/irq.c
--- a/xen/arch/x86/irq.c        Wed May 20 15:29:25 2009 +0100
+++ b/xen/arch/x86/irq.c        Wed May 20 15:30:36 2009 +0100
@@ -844,7 +844,7 @@ void pirq_guest_unbind(struct domain *d,
         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 -r 5369133d772c -r 1695a86b3d7c xen/drivers/passthrough/amd/iommu_intr.c
--- a/xen/drivers/passthrough/amd/iommu_intr.c  Wed May 20 15:29:25 2009 +0100
+++ b/xen/drivers/passthrough/amd/iommu_intr.c  Wed May 20 15:30:36 2009 +0100
@@ -108,9 +108,6 @@ static void update_intremap_entry_from_i
     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 -r 5369133d772c -r 1695a86b3d7c xen/include/asm-x86/io_apic.h
--- a/xen/include/asm-x86/io_apic.h     Wed May 20 15:29:25 2009 +0100
+++ b/xen/include/asm-x86/io_apic.h     Wed May 20 15:30:36 2009 +0100
@@ -167,12 +167,6 @@ static inline void io_apic_modify(unsign
 /* 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_resume(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 -r 5369133d772c -r 1695a86b3d7c xen/include/asm-x86/irq.h
--- a/xen/include/asm-x86/irq.h Wed May 20 15:29:25 2009 +0100
+++ b/xen/include/asm-x86/irq.h Wed May 20 15:30:36 2009 +0100
@@ -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 -r 5369133d772c -r 1695a86b3d7c 
xen/include/asm-x86/mach-default/smpboot_hooks.h
--- a/xen/include/asm-x86/mach-default/smpboot_hooks.h  Wed May 20 15:29:25 
2009 +0100
+++ b/xen/include/asm-x86/mach-default/smpboot_hooks.h  Wed May 20 15:30:36 
2009 +0100
@@ -1,10 +1,5 @@
 /* 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)
 {

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