diff --git a/[refs] b/[refs]
index 0efff42d7031..defd3a38ba47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee408c79420b6a437332d6977fe33ab72c36dc97
+refs/heads/master: 5580eceed2014135231acb3e6906accf97e10f3c
diff --git a/trunk/include/asm-x86_64/irq.h b/trunk/include/asm-x86_64/irq.h
index fb724ba37ae6..9db5a1b4f7b1 100644
--- a/trunk/include/asm-x86_64/irq.h
+++ b/trunk/include/asm-x86_64/irq.h
@@ -36,7 +36,7 @@
 #define NR_IRQ_VECTORS NR_IRQS
 #else
 #define NR_IRQS 224
-#define NR_IRQ_VECTORS 1024
+#define NR_IRQ_VECTORS (32 * NR_CPUS)
 #endif
 
 static __inline__ int irq_canonicalize(int irq)