]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
x86: fix IO APIC resource allocation error message
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 20 Mar 2009 20:02:55 +0000 (21:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 20 Mar 2009 20:02:55 +0000 (21:02 +0100)
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

index 42cdc78427a2ba6643823969e11b238eb4739a9d..d882c03604eea510fdaba8edf313b4e61154c619 100644 (file)
@@ -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++) {