aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2010-02-10 04:20:36 -0500
committerH. Peter Anvin <hpa@zytor.com>2010-02-17 20:29:21 -0500
commit6738762d73a237ec322b04d8b9d55c8fd5d84713 (patch)
tree8b7856841d05602f322736ced2d8da9eb9b4494a /arch
parentb5eb78f76ddfa7caf4340cf6893b032f45d8114a (diff)
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@kernel.org> LKML-Reference: <1265793639-15071-33-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/apic/io_apic.c22
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 f5e40339622b..c64ddd9d9979 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)
3826 printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi); 3826 printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
3827} 3827}
3828 3828
3829#ifdef CONFIG_SPARSE_IRQ
3830int __init arch_probe_nr_irqs(void)
3831{
3832 int nr;
3833
3834 if (nr_irqs > (NR_VECTORS * nr_cpu_ids))
3835 nr_irqs = NR_VECTORS * nr_cpu_ids;
3836
3837 nr = nr_irqs_gsi + 8 * nr_cpu_ids;
3838#if defined(CONFIG_PCI_MSI) || defined(CONFIG_HT_IRQ)
3839 /*
3840 * for MSI and HT dyn irq
3841 */
3842 nr += nr_irqs_gsi * 16;
3843#endif
3844 if (nr < nr_irqs)
3845 nr_irqs = nr;
3846
3847 return 0;
3848}
3849#endif
3850
3851static int __io_apic_set_pci_routing(struct device *dev, int irq, 3829static int __io_apic_set_pci_routing(struct device *dev, int irq,
3852 struct io_apic_irq_attr *irq_attr) 3830 struct io_apic_irq_attr *irq_attr)
3853{ 3831{