From cb3ace8f2c67ef083c99880239b3e7540aeeecca Mon Sep 17 00:00:00 2001
From: Paul Bolle <pebolle@tiscali.nl>
Date: Mon, 14 Feb 2011 22:52:38 +0100
Subject: [PATCH] --- yaml --- r: 233255 b: refs/heads/master c:
 678301ecadec24ff77ab310eebf8a32ccddb1850 h: refs/heads/master i:   233253:
 d8a4f006b90f8ed50292c5b2d3dac4a8aa5c3588   233251:
 e9cb1894e337a4fd9a337945e1b74041216ca7a0   233247:
 c99b83a6cf282ec73fb1d21fac4e4ade63de825d v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/kernel/apic/io_apic.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8ffa8b469431..7748316661b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c9d16e35911090dee3f9313e6af13af623d66ee
+refs/heads/master: 678301ecadec24ff77ab310eebf8a32ccddb1850
diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c
index 697dc34b7b87..ca9e2a3545a9 100644
--- a/trunk/arch/x86/kernel/apic/io_apic.c
+++ b/trunk/arch/x86/kernel/apic/io_apic.c
@@ -4002,6 +4002,9 @@ int mp_find_ioapic(u32 gsi)
 {
 	int i = 0;
 
+	if (nr_ioapics == 0)
+		return -1;
+
 	/* Find the IOAPIC that manages this GSI. */
 	for (i = 0; i < nr_ioapics; i++) {
 		if ((gsi >= mp_gsi_routing[i].gsi_base)