---

yaml --- r: 138803 b: refs/heads/master c: 04c93ce h: refs/heads/master i: 138801: bbe7e38 138799: b06b05d v: v3
git-mirror · Mar 20, 2009 · 5683e6e · 5683e6e
1 parent f71976c
commit 5683e6e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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++) {