From 5683e6ef2611865ca11dffee1a90e816d92c889b Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 20 Mar 2009 21:02:55 +0100
Subject: [PATCH] --- yaml --- r: 138803 b: refs/heads/master c:
 04c93ce4991fce731dab346d03964504339347db h: refs/heads/master i:   138801:
 bbe7e38225ec8ec0d3028f20db7cf923beda27e0   138799:
 b06b05dae001de655563aedf16259bb06eab75b4 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/kernel/apic/io_apic.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4012d4d7a198..2e3d56524a89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f00a2495bf5b98b097c47be5d6e2d4114ec39bf
+refs/heads/master: 04c93ce4991fce731dab346d03964504339347db
diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c
index 42cdc78427a2..d882c03604ee 100644
--- a/trunk/arch/x86/kernel/apic/io_apic.c
+++ b/trunk/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++) {