From: tip-bot for David Cohen <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
tglx@linutronix.de, david.a.cohen@intel.com
Subject: [tip:irq/core] irq/x86/io_apic: Fix number of pre-allocated irqs
Date: Tue, 28 May 2013 06:38:32 -0700 [thread overview]
Message-ID: <tip-8c956b1b935ec98decb470a6abff8c1f8b28e9f0@git.kernel.org> (raw)
In-Reply-To: <1367364015-12521-1-git-send-email-david.a.cohen@intel.com>
Commit-ID: 8c956b1b935ec98decb470a6abff8c1f8b28e9f0
Gitweb: http://git.kernel.org/tip/8c956b1b935ec98decb470a6abff8c1f8b28e9f0
Author: David Cohen <david.a.cohen@intel.com>
AuthorDate: Tue, 30 Apr 2013 16:20:15 -0700
Committer: Ingo Molnar <mingo@kernel.org>
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@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: joro@8bytes.org
Link: http://lkml.kernel.org/r/1367364015-12521-1-git-send-email-david.a.cohen@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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,
next prev parent reply other threads:[~2013-05-28 13:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-30 23:20 [PATCH] x86, io_apic: " David Cohen
2013-05-28 13:38 ` tip-bot for David Cohen [this message]
2013-05-29 9:08 ` [tip:irq/core] irq/x86/io_apic: " Thomas Gleixner
2013-05-29 9:19 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-8c956b1b935ec98decb470a6abff8c1f8b28e9f0@git.kernel.org \
--to=tipbot@zytor.com \
--cc=david.a.cohen@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®