From bfafcccb2841d3e00ccef426ba67ea6e3ac1d1d2 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Sun, 10 Aug 2008 00:35:50 -0700
Subject: [PATCH] --- yaml --- r: 108165 b: refs/heads/master c:
 3c7569b284e1be55d086b61a70d9f545326f6d74 h: refs/heads/master i:   108163:
 e620d70515a6a85f79f53670a4f0b7d48a72f3fe v: v3

---
 [refs]                              |  2 +-
 trunk/include/asm-x86/irq_vectors.h | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fd5f89f64273..78709432d60a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d388e5fdc461344d04307a3fa83862b9ed429647
+refs/heads/master: 3c7569b284e1be55d086b61a70d9f545326f6d74
diff --git a/trunk/include/asm-x86/irq_vectors.h b/trunk/include/asm-x86/irq_vectors.h
index 90b1d1f12f08..b95d167b7fb2 100644
--- a/trunk/include/asm-x86/irq_vectors.h
+++ b/trunk/include/asm-x86/irq_vectors.h
@@ -109,7 +109,15 @@
 #define LAST_VM86_IRQ		15
 #define invalid_vm86_irq(irq)	((irq) < 3 || (irq) > 15)
 
-#if !defined(CONFIG_X86_VOYAGER)
+#ifdef CONFIG_X86_64
+# if NR_CPUS < MAX_IO_APICS
+#  define NR_IRQS (NR_VECTORS + (32 * NR_CPUS))
+# else
+#  define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS))
+# endif
+# define NR_IRQ_VECTORS NR_IRQS
+
+#elif !defined(CONFIG_X86_VOYAGER)
 
 # if defined(CONFIG_X86_IO_APIC) || defined(CONFIG_PARAVIRT) || defined(CONFIG_X86_VISWS)