Because of the nasty way that CONFIG_PCI_MSI was implemented we wound up with set_irq_info and set_native_irq_info, with move_irq and move_native_irq. Both functions did the same thing but they were built and called under different circumstances. Now that the msi hacks are gone we can kill move_irq and set_irq_info. Signed-off-by: Eric W. Biederman <[email protected]> --- include/linux/irq.h | 36 ------------------------------------ 1 files changed, 0 insertions(+), 36 deletions(-) diff --git a/include/linux/irq.h b/include/linux/irq.h index 6d1ad88..cfd2f31 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -202,36 +202,6 @@ void set_pending_irq(unsigned int irq, c void move_native_irq(int irq); void move_masked_irq(int irq); -#ifdef CONFIG_PCI_MSI -/* - * Wonder why these are dummies? - * For e.g the set_ioapic_affinity_vector() calls the set_ioapic_affinity_irq() - * counter part after translating the vector to irq info. We need to perform - * this operation on the real irq, when we dont use vector, i.e when - * pci_use_vector() is false. - */ -static inline void move_irq(int irq) -{ -} - -static inline void set_irq_info(int irq, cpumask_t mask) -{ -} - -#else /* CONFIG_PCI_MSI */ - -static inline void move_irq(int irq) -{ - move_native_irq(irq); -} - -static inline void set_irq_info(int irq, cpumask_t mask) -{ - set_native_irq_info(irq, mask); -} - -#endif /* CONFIG_PCI_MSI */ - #else /* CONFIG_GENERIC_PENDING_IRQ || CONFIG_IRQBALANCE */ static inline void move_irq(int irq) @@ -250,16 +220,10 @@ static inline void set_pending_irq(unsig { } -static inline void set_irq_info(int irq, cpumask_t mask) -{ - set_native_irq_info(irq, mask); -} - #endif /* CONFIG_GENERIC_PENDING_IRQ */ #else /* CONFIG_SMP */ -#define move_irq(x) #define move_native_irq(x) #define move_masked_irq(x) -- 1.4.0.gc07e - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- [PATCH 20/25] irq: Generalize the check for HARDIRQ_BITS.
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 20/25] irq: Generalize the check for HARDIRQ_BITS.
- References:
- [PATCH 0/25] Decouple IRQ issues (MSI, i386, x86_64, ia64)
- From: [email protected] (Eric W. Biederman)
- [PATCH 1/25] irq: Convert the move_irq flag from a 32bit word to a single bit
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 2/25] irq: Add moved_masked_irq
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 3/25] x86_64 irq: Reenable migrating irqs to other cpus.
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 4/25] msi: Simplify msi enable and disable.
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 5/25] msi: Make the msi boolean tests return either 0 or 1.
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 6/25] msi: Implement helper functions read_msi_msg and write_msi_msg.
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 7/25] msi: Refactor the msi_ops.
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 8/25] msi: Simplify the msi irq limit policy.
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 9/25] irq: Add a dynamic irq creation API
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 10/25] ia64 irq: Dynamic irq support
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 11/25] i386 irq: Dynamic irq support
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 12/25] x86_64 irq: Dynamic irq support
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 13/25] msi: Make the msi code irq based and not vector based.
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 14/25] x86_64 irq: Move msi message composition into io_apic.c
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 15/25] i386 irq: Move msi message composition into io_apic.c
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 16/25] msi: Only build msi-apic.c on ia64
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 17/25] x86_64 irq: Remove the msi assumption that irq == vector
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 18/25] i386 irq: Remove the msi assumption that irq == vector
- From: "Eric W. Biederman" <[email protected]>
- [PATCH 0/25] Decouple IRQ issues (MSI, i386, x86_64, ia64)
- Prev by Date: [PATCH 11/25] i386 irq: Dynamic irq support
- Next by Date: [PATCH 12/25] x86_64 irq: Dynamic irq support
- Previous by thread: [PATCH 18/25] i386 irq: Remove the msi assumption that irq == vector
- Next by thread: [PATCH 20/25] irq: Generalize the check for HARDIRQ_BITS.
- Index(es):
 |