[PATCH] x86, io_apic: Fix number of pre-allocated irqs

From: David Cohen
Date: Tue Apr 30 2013 - 19:17:55 EST

arch_probe_nr_irqs() has a typo when returning number of preallocated
irqs. Instead of returning the calculated value, it returns a constant
This patch makes sure the calculated value is returned intead.

Signed-off-by: David Cohen <david.a.cohen@xxxxxxxxx>
arch/x86/kernel/apic/io_apic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 9ed796c..7ef2bd9 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3437,7 +3437,7 @@ int __init arch_probe_nr_irqs(void)
if (nr < nr_irqs)
nr_irqs = nr;

- return NR_IRQS_LEGACY;
+ return nr;

int io_apic_set_pci_routing(struct device *dev, int irq,

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/