aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-08-19 23:50:04 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-16 10:52:09 -0400
commitbfea1238beac9d306eeac081c67de5ca6aec4c7a (patch)
tree1d2a1c15a36e529615210417ababa28f953fabe8
parent71f521bbaf375b685aeea20c6b0ed8600cd6edfe (diff)
x86: remove nr_irq_vectors
remove unused defines derived from the (now obsolete) NR_IRQS define. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/asm-x86/irq_vectors.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-x86/irq_vectors.h b/include/asm-x86/irq_vectors.h
index c5d2d767a1f3..cb09802ce651 100644
--- a/include/asm-x86/irq_vectors.h
+++ b/include/asm-x86/irq_vectors.h
@@ -116,7 +116,6 @@
116# else 116# else
117# define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS)) 117# define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS))
118# endif 118# endif
119# define NR_IRQ_VECTORS NR_IRQS
120 119
121#elif !defined(CONFIG_X86_VOYAGER) 120#elif !defined(CONFIG_X86_VOYAGER)
122 121
@@ -124,23 +123,15 @@
124 123
125# define NR_IRQS 224 124# define NR_IRQS 224
126 125
127# if (224 >= 32 * NR_CPUS)
128# define NR_IRQ_VECTORS NR_IRQS
129# else
130# define NR_IRQ_VECTORS (32 * NR_CPUS)
131# endif
132
133# else /* IO_APIC || PARAVIRT */ 126# else /* IO_APIC || PARAVIRT */
134 127
135# define NR_IRQS 16 128# define NR_IRQS 16
136# define NR_IRQ_VECTORS NR_IRQS
137 129
138# endif 130# endif
139 131
140#else /* !VISWS && !VOYAGER */ 132#else /* !VISWS && !VOYAGER */
141 133
142# define NR_IRQS 224 134# define NR_IRQS 224
143# define NR_IRQ_VECTORS NR_IRQS
144 135
145#endif /* VISWS */ 136#endif /* VISWS */
146 137