[tip:x86/irq] x86, irq: Remove arch_probe_nr_irqs
in [Kernel]
|
Prev: [PATCH net-next 05/15] drivers/net/bnx2x: Use (pr|netdev|netif)_<level> macro helpers
Next: [tip:x86/irq] sparseirq: Change irq_desc_ptrs to static
From: tip-bot for Yinghai Lu on 17 Feb 2010 21:00 Commit-ID: 6738762d73a237ec322b04d8b9d55c8fd5d84713 Gitweb: http://git.kernel.org/tip/6738762d73a237ec322b04d8b9d55c8fd5d84713 Author: Yinghai Lu <yinghai(a)kernel.org> AuthorDate: Wed, 10 Feb 2010 01:20:36 -0800 Committer: H. Peter Anvin <hpa(a)zytor.com> CommitDate: Wed, 17 Feb 2010 17:29:21 -0800 x86, irq: Remove arch_probe_nr_irqs So keep nr_irqs == NR_IRQS. With radix trees is matters less. Signed-off-by: Yinghai Lu <yinghai(a)kernel.org> LKML-Reference: <1265793639-15071-33-git-send-email-yinghai(a)kernel.org> Signed-off-by: H. Peter Anvin <hpa(a)zytor.com> --- arch/x86/kernel/apic/io_apic.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index f5e4033..c64ddd9 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -3826,28 +3826,6 @@ void __init probe_nr_irqs_gsi(void) printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi); } -#ifdef CONFIG_SPARSE_IRQ -int __init arch_probe_nr_irqs(void) -{ - int nr; - - if (nr_irqs > (NR_VECTORS * nr_cpu_ids)) - nr_irqs = NR_VECTORS * nr_cpu_ids; - - nr = nr_irqs_gsi + 8 * nr_cpu_ids; -#if defined(CONFIG_PCI_MSI) || defined(CONFIG_HT_IRQ) - /* - * for MSI and HT dyn irq - */ - nr += nr_irqs_gsi * 16; -#endif - if (nr < nr_irqs) - nr_irqs = nr; - - return 0; -} -#endif - static int __io_apic_set_pci_routing(struct device *dev, int irq, struct io_apic_irq_attr *irq_attr) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |