diff options
Diffstat (limited to 'arch/x86/include/asm/irq_vectors.h')
-rw-r--r-- | arch/x86/include/asm/irq_vectors.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h index 602361ad0e7..a16a2ab2b42 100644 --- a/arch/x86/include/asm/irq_vectors.h +++ b/arch/x86/include/asm/irq_vectors.h | |||
@@ -115,14 +115,11 @@ | |||
115 | # endif | 115 | # endif |
116 | #else | 116 | #else |
117 | 117 | ||
118 | /* defined as a macro so nr_irqs = max_nr_irqs(nr_cpu_ids) can be used */ | 118 | # define NR_IRQS \ |
119 | # define max_nr_irqs(nr_cpus) \ | 119 | ((8 * NR_CPUS) > (32 * MAX_IO_APICS) ? \ |
120 | ((8 * nr_cpus) > (32 * MAX_IO_APICS) ? \ | ||
121 | (NR_VECTORS + (8 * NR_CPUS)) : \ | 120 | (NR_VECTORS + (8 * NR_CPUS)) : \ |
122 | (NR_VECTORS + (32 * MAX_IO_APICS))) \ | 121 | (NR_VECTORS + (32 * MAX_IO_APICS))) \ |
123 | 122 | ||
124 | # define NR_IRQS max_nr_irqs(NR_CPUS) | ||
125 | |||
126 | #endif | 123 | #endif |
127 | 124 | ||
128 | #elif defined(CONFIG_X86_VOYAGER) | 125 | #elif defined(CONFIG_X86_VOYAGER) |