ia64/xen-unstable

changeset 19630:1695a86b3d7c

x86: some assorted irq related cleanups

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed May 20 15:30:36 2009 +0100 (2009-05-20)
parents 5369133d772c
children cafab2084410
files xen/arch/x86/io_apic.c xen/arch/x86/irq.c xen/drivers/passthrough/amd/iommu_intr.c xen/include/asm-x86/io_apic.h xen/include/asm-x86/irq.h xen/include/asm-x86/mach-default/smpboot_hooks.h
line diff
     1.1 --- a/xen/arch/x86/io_apic.c	Wed May 20 15:29:25 2009 +0100
     1.2 +++ b/xen/arch/x86/io_apic.c	Wed May 20 15:30:36 2009 +0100
     1.3 @@ -1781,7 +1781,7 @@ static inline void check_timer(void)
     1.4  
     1.5  static struct IO_APIC_route_entry *ioapic_pm_state;
     1.6  
     1.7 -void ioapic_pm_state_alloc(void)
     1.8 +static void __init ioapic_pm_state_alloc(void)
     1.9  {
    1.10      int i, nr_entry = 0;
    1.11  
     2.1 --- a/xen/arch/x86/irq.c	Wed May 20 15:29:25 2009 +0100
     2.2 +++ b/xen/arch/x86/irq.c	Wed May 20 15:30:36 2009 +0100
     2.3 @@ -844,7 +844,7 @@ void pirq_guest_unbind(struct domain *d,
     2.4          xfree(oldaction);
     2.5  }
     2.6  
     2.7 -int pirq_guest_force_unbind(struct domain *d, int irq)
     2.8 +static int pirq_guest_force_unbind(struct domain *d, int irq)
     2.9  {
    2.10      irq_desc_t *desc;
    2.11      irq_guest_action_t *action, *oldaction = NULL;
     3.1 --- a/xen/drivers/passthrough/amd/iommu_intr.c	Wed May 20 15:29:25 2009 +0100
     3.2 +++ b/xen/drivers/passthrough/amd/iommu_intr.c	Wed May 20 15:30:36 2009 +0100
     3.3 @@ -108,9 +108,6 @@ static void update_intremap_entry_from_i
     3.4      return;
     3.5  }
     3.6  
     3.7 -extern int nr_ioapic_registers[MAX_IO_APICS];
     3.8 -extern int nr_ioapics;
     3.9 -
    3.10  int __init amd_iommu_setup_intremap_table(void)
    3.11  {
    3.12      struct IO_APIC_route_entry rte = {0};
     4.1 --- a/xen/include/asm-x86/io_apic.h	Wed May 20 15:29:25 2009 +0100
     4.2 +++ b/xen/include/asm-x86/io_apic.h	Wed May 20 15:30:36 2009 +0100
     4.3 @@ -167,12 +167,6 @@ static inline void io_apic_modify(unsign
     4.4  /* 1 if "noapic" boot option passed */
     4.5  extern int skip_ioapic_setup;
     4.6  
     4.7 -/*
     4.8 - * If we use the IO-APIC for IRQ routing, disable automatic
     4.9 - * assignment of PCI IRQ's.
    4.10 - */
    4.11 -#define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs)
    4.12 -
    4.13  #ifdef CONFIG_ACPI_BOOT
    4.14  extern int io_apic_get_unique_id (int ioapic, int apic_id);
    4.15  extern int io_apic_get_version (int ioapic);
    4.16 @@ -186,7 +180,6 @@ extern void ioapic_suspend(void);
    4.17  extern void ioapic_resume(void);
    4.18  
    4.19  #else  /* !CONFIG_X86_IO_APIC */
    4.20 -#define io_apic_assign_pci_irqs 0
    4.21  static inline void ioapic_suspend(void) {}
    4.22  static inline void ioapic_resume(void) {}
    4.23  #endif
     5.1 --- a/xen/include/asm-x86/irq.h	Wed May 20 15:29:25 2009 +0100
     5.2 +++ b/xen/include/asm-x86/irq.h	Wed May 20 15:30:36 2009 +0100
     5.3 @@ -64,6 +64,4 @@ void free_domain_pirqs(struct domain *d)
     5.4                                         (vec) > LAST_LEGACY_VECTOR) ? \
     5.5                                        0 : LEGACY_IRQ_FROM_VECTOR(vec))
     5.6  
     5.7 -int pirq_guest_force_unbind(struct domain *d, int irq);
     5.8 -
     5.9  #endif /* _ASM_HW_IRQ_H */
     6.1 --- a/xen/include/asm-x86/mach-default/smpboot_hooks.h	Wed May 20 15:29:25 2009 +0100
     6.2 +++ b/xen/include/asm-x86/mach-default/smpboot_hooks.h	Wed May 20 15:30:36 2009 +0100
     6.3 @@ -1,11 +1,6 @@
     6.4  /* two abstractions specific to kernel/smpboot.c, mainly to cater to visws
     6.5   * which needs to alter them. */
     6.6  
     6.7 -static inline void smpboot_clear_io_apic_irqs(void)
     6.8 -{
     6.9 -	io_apic_irqs = 0;
    6.10 -}
    6.11 -
    6.12  static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
    6.13  {
    6.14  	CMOS_WRITE(0xa, 0xf);