From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
ajb.stxsl@googlemail.com, bzolnier@gmail.com, tglx@linutronix.de,
mingo@elte.hu
Subject: [tip:x86/apic] x86: fix IO APIC resource allocation error message
Date: Fri, 20 Mar 2009 20:03:26 GMT [thread overview]
Message-ID: <tip-04c93ce4991fce731dab346d03964504339347db@git.kernel.org> (raw)
In-Reply-To: <200903202100.30789.bzolnier@gmail.com>
Commit-ID: 04c93ce4991fce731dab346d03964504339347db
Gitweb: http://git.kernel.org/tip/04c93ce4991fce731dab346d03964504339347db
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
AuthorDate: Fri, 20 Mar 2009 21:02:55 +0100
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 20 Mar 2009 21:02:55 +0100
x86: fix IO APIC resource allocation error message
Impact: fix incorrect error message
- IO APIC resource allocation error message contains one too many "be".
- Print the error message iff there are IO APICs in the system.
I've seen this error message for some time on my x86-32 laptop...
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Alan Bartlett <ajb.stxsl@googlemail.com>
LKML-Reference: <200903202100.30789.bzolnier@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/apic/io_apic.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 42cdc78..d882c03 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -4130,9 +4130,12 @@ static int __init ioapic_insert_resources(void)
struct resource *r = ioapic_resources;
if (!r) {
- printk(KERN_ERR
- "IO APIC resources could be not be allocated.\n");
- return -1;
+ if (nr_ioapics > 0) {
+ printk(KERN_ERR
+ "IO APIC resources couldn't be allocated.\n");
+ return -1;
+ }
+ return 0;
}
for (i = 0; i < nr_ioapics; i++) {
next prev parent reply other threads:[~2009-03-20 20:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-20 19:12 [PATCH] " Bartlomiej Zolnierkiewicz
2009-03-20 19:23 ` Ingo Molnar
2009-03-20 20:00 ` Bartlomiej Zolnierkiewicz
2009-03-20 20:03 ` Bartlomiej Zolnierkiewicz [this message]
2009-03-20 19:33 ` Cyrill Gorcunov
2009-03-20 20:02 ` Bartlomiej Zolnierkiewicz
2009-03-20 20:09 ` Cyrill Gorcunov
2009-03-20 20:27 ` Bartlomiej Zolnierkiewicz
2009-03-20 20:36 ` Cyrill Gorcunov
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-04c93ce4991fce731dab346d03964504339347db@git.kernel.org \
--to=bzolnier@gmail.com \
--cc=ajb.stxsl@googlemail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--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
Powered by JetHome