Commit-ID: 8c956b1b935ec98decb470a6abff8c1f8b28e9f0 Gitweb: http://git.kernel.org/tip/8c956b1b935ec98decb470a6abff8c1f8b28e9f0 Author: David Cohen <david.a.cohen@xxxxxxxxx> AuthorDate: Tue, 30 Apr 2013 16:20:15 -0700 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Tue, 28 May 2013 12:01:29 +0200 irq/x86/io_apic: Fix number of pre-allocated irqs arch_probe_nr_irqs() has a typo when returning number of preallocated irqs. Instead of returning the calculated value, it returns a constant number NR_IRQ_LEGACY. This patch makes sure the calculated value is returned intead. Signed-off-by: David Cohen <david.a.cohen@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: joro@xxxxxxxxxx Link: http://lkml.kernel.org/r/1367364015-12521-1-git-send-email-david.a.cohen@xxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- 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-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|