Jan Beulich
2009-May-20 13:07 UTC
[Xen-devel] [PATCH] x86: some assorted irq related cleanups
Signed-off-by: Jan Beulich <jbeulich@novell.com> --- 2009-05-19.orig/xen/arch/x86/io_apic.c 2009-05-19 17:12:13.000000000 +0200 +++ 2009-05-19/xen/arch/x86/io_apic.c 2009-05-19 17:13:19.000000000 +0200 @@ -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; --- 2009-05-19.orig/xen/arch/x86/irq.c 2009-05-19 17:12:13.000000000 +0200 +++ 2009-05-19/xen/arch/x86/irq.c 2009-04-02 09:16:26.000000000 +0200 @@ -838,7 +838,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; --- 2009-05-19.orig/xen/drivers/passthrough/amd/iommu_intr.c 2009-04-29 10:33:23.000000000 +0200 +++ 2009-05-19/xen/drivers/passthrough/amd/iommu_intr.c 2009-05-19 17:12:55.000000000 +0200 @@ -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}; --- 2009-05-19.orig/xen/include/asm-x86/io_apic.h 2009-05-19 17:12:13.000000000 +0200 +++ 2009-05-19/xen/include/asm-x86/io_apic.h 2009-05-19 17:13:48.000000000 +0200 @@ -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_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 --- 2009-05-19.orig/xen/include/asm-x86/irq.h 2009-05-19 17:12:13.000000000 +0200 +++ 2009-05-19/xen/include/asm-x86/irq.h 2009-04-02 09:16:35.000000000 +0200 @@ -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 */ --- 2009-05-19.orig/xen/include/asm-x86/mach-default/smpboot_hooks.h 2009-05-19 17:12:13.000000000 +0200 +++ 2009-05-19/xen/include/asm-x86/mach-default/smpboot_hooks.h 2009-04-01 11:52:56.000000000 +0200 @@ -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); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel