---

yaml --- r: 136674 b: refs/heads/master c: c379698 h: refs/heads/master v: v3
git-mirror · Jan 31, 2009 · f202fea · f202fea
1 parent 57c34e2
commit f202fea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fc2e79d4f239c1c1dfdab7b10854c7588b39d9a
+refs/heads/master: c379698fdac7cb65c96dec549850ce606dd6ceba
diff --git a/trunk/arch/x86/include/asm/irq_vectors.h b/trunk/arch/x86/include/asm/irq_vectors.h
@@ -1,8 +1,6 @@
 #ifndef _ASM_X86_IRQ_VECTORS_H
 #define _ASM_X86_IRQ_VECTORS_H
 
-#include <linux/threads.h>
-
 /*
  * Linux IRQ vector layout.
  *
@@ -131,22 +129,18 @@
 #define NR_IRQS_LEGACY			  16
 
 #ifdef CONFIG_X86_IO_APIC
-
-#include <asm/apicnum.h>	/* need MAX_IO_APICS */
-
-#ifndef CONFIG_SPARSE_IRQ
-# if NR_CPUS < MAX_IO_APICS
-#  define NR_IRQS 			(NR_VECTORS + (32 * NR_CPUS))
+# ifndef CONFIG_SPARSE_IRQ
+#  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
 # else
-#  define NR_IRQS			(NR_VECTORS + (32 * MAX_IO_APICS))
-# endif
-#else
-# define NR_IRQS					\
+#  define NR_IRQS					\
 	((8 * NR_CPUS) > (32 * MAX_IO_APICS) ?		\
 		(NR_VECTORS + (8 * NR_CPUS)) :		\
 		(NR_VECTORS + (32 * MAX_IO_APICS)))
-#endif
-
+# endif
 #else /* !CONFIG_X86_IO_APIC: */
 # define NR_IRQS			16
 #endif