From 9f7714b86f34166131e63e5b483dff33e3ac9a4d Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Thu, 21 Aug 2008 13:10:09 -0700
Subject: [PATCH] --- yaml --- r: 116465 b: refs/heads/master c:
 052c0bff9b83a578654dfa513d6e3d0b3795f1e8 h: refs/heads/master i:   116463:
 b05d8461bac24f59eb8c761b9bf692a6fb158a95 v: v3

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

diff --git a/[refs] b/[refs]
index a10cf7cabe2e..3ecc8a6ce1e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2d332fa3445160519de03c350a59602ac1c3df9
+refs/heads/master: 052c0bff9b83a578654dfa513d6e3d0b3795f1e8
diff --git a/trunk/arch/x86/kernel/io_apic.c b/trunk/arch/x86/kernel/io_apic.c
index 4e44fd1f466e..d28128e0392c 100644
--- a/trunk/arch/x86/kernel/io_apic.c
+++ b/trunk/arch/x86/kernel/io_apic.c
@@ -3625,16 +3625,21 @@ int __init probe_nr_irqs(void)
 {
 	int idx;
 	int nr = 0;
+#ifndef CONFIG_XEN
+	int nr_min = 32;
+#else
+	int nr_min = NR_IRQS;
+#endif
 
 	for (idx = 0; idx < nr_ioapics; idx++)
-		nr += io_apic_get_redir_entries(idx);
+		nr += io_apic_get_redir_entries(idx) + 1;
 
 	/* double it for hotplug and msi and nmi */
 	nr <<= 1;
 
 	/* something wrong ? */
-	if (nr < 32)
-		nr = 32;
+	if (nr < nr_min)
+		nr = nr_min;
 
 	return nr;
 }