x86: arch_probe_nr_irqs

Impact: save RAM with large NR_CPUS, get smaller nr_irqs

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Mike Travis <travis@sgi.com>

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 @@
 # endif
 #else
 
-/* defined as a macro so nr_irqs = max_nr_irqs(nr_cpu_ids) can be used */
-# define max_nr_irqs(nr_cpus)                           \
-        ((8 * nr_cpus) > (32 * MAX_IO_APICS) ?          \
+# define NR_IRQS                                        \
+        ((8 * NR_CPUS) > (32 * MAX_IO_APICS) ?          \
                 (NR_VECTORS + (8 * NR_CPUS)) :          \
                 (NR_VECTORS + (32 * MAX_IO_APICS)))     \
 
-# define NR_IRQS max_nr_irqs(NR_CPUS)
-
 #endif
 
 #elif defined(CONFIG_X86_VOYAGER)