[PATCH 18/20] x86: remove arch_probe_nr_irqs

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Yinghai Lu
Date: Sunday, March 21, 2010 - 12:13 am

so keep nr_irqs == NR_IRQS

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 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 c03bcd4..ed8002b 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3917,28 +3917,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)
 {
-- 
1.6.4.2

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/20] x86: early_res and irq_desc, Yinghai Lu, (Sun Mar 21, 12:13 am)
[PATCH 01/20] x86: add find_e820_area_node, Yinghai Lu, (Sun Mar 21, 12:13 am)
[PATCH 02/20] x86: add get_centaur_ram_top, Yinghai Lu, (Sun Mar 21, 12:13 am)
[PATCH 03/20] x86: make e820 to be static, Yinghai Lu, (Sun Mar 21, 12:13 am)
[PATCH 05/20] x86: make e820 to be initdata, Yinghai Lu, (Sun Mar 21, 12:13 am)
[PATCH 08/20] x86: fix out of order of gsi - full, Yinghai Lu, (Sun Mar 21, 12:13 am)
[PATCH 10/20] x86: kill smpboot_hooks.h, Yinghai Lu, (Sun Mar 21, 12:13 am)
[PATCH 18/20] x86: remove arch_probe_nr_irqs, Yinghai Lu, (Sun Mar 21, 12:13 am)
Re: [PATCH 00/20] x86: early_res and irq_desc, Benjamin Herrenschmidt, (Sun Mar 21, 7:35 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Sun Mar 21, 7:37 pm)
Questions about SMP bootup control, Zhu, Yijun (NSN - CN ..., (Sun Mar 21, 7:46 pm)
Re: [PATCH 00/20] x86: early_res and irq_desc, Yinghai Lu, (Sun Mar 21, 8:26 pm)
Re: Questions about SMP bootup control, Andi Kleen, (Sun Mar 21, 8:29 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Sun Mar 21, 10:12 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Eric W. Biederman, (Mon Mar 22, 12:05 am)
RE: Questions about SMP bootup control, Zhu, Yijun (NSN - CN ..., (Mon Mar 22, 12:45 am)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Mon Mar 22, 1:47 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Mon Mar 22, 2:01 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Mon Mar 22, 2:04 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Mon Mar 22, 2:07 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Mon Mar 22, 2:08 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Mon Mar 22, 2:52 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Mon Mar 22, 2:54 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Geert Uytterhoeven, (Tue Mar 23, 1:53 am)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Tue Mar 23, 9:24 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Tue Mar 23, 9:29 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Tue Mar 23, 9:44 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Tue Mar 23, 9:50 pm)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Wed Mar 24, 12:43 am)
Re: [PATCH 06/20] early_res: seperate common memmap func f ..., Benjamin Herrenschmidt, (Wed Mar 24, 2:32 am)