summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlan Mayer <ajm@sgi.com>2008-03-26 16:11:31 -0500
committerIngo Molnar <mingo@elte.hu>2008-05-12 21:28:05 +0200
commit6859a8402945cf1d74af75a2e1aa4e327a506ab4 (patch)
treefd663e47f31a8c30718af560132e1e58940c475f /include
parent492c2e476eac010962850006c49df326919b284c (diff)
downloadop-kernel-dev-6859a8402945cf1d74af75a2e1aa4e327a506ab4.zip
op-kernel-dev-6859a8402945cf1d74af75a2e1aa4e327a506ab4.tar.gz
x86: resize NR_IRQS for large machines
On machines with very large numbers of cpus, tables that are dimensioned by NR_IRQS get very large, especially the irq_desc table. They are also very sparsely used. When the cpu count is > MAX_IO_APICS, use MAX_IO_APICS to set NR_IRQS, otherwise use NR_CPUS. Signed-off-by: Alan Mayer <ajm@sgi.com> Reviewed-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/irq_64.h6
-rw-r--r--include/linux/kernel_stat.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-x86/irq_64.h b/include/asm-x86/irq_64.h
index 083d35a..7608176 100644
--- a/include/asm-x86/irq_64.h
+++ b/include/asm-x86/irq_64.h
@@ -10,6 +10,8 @@
* <tomsoft@informatik.tu-chemnitz.de>
*/
+#include <asm/apicdef.h>
+
#define TIMER_IRQ 0
/*
@@ -31,7 +33,11 @@
#define FIRST_SYSTEM_VECTOR 0xef /* duplicated in hw_irq.h */
+#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
#define NR_IRQ_VECTORS NR_IRQS
static inline int irq_canonicalize(int irq)
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index e8ffce8..cf9f40a 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -1,11 +1,11 @@
#ifndef _LINUX_KERNEL_STAT_H
#define _LINUX_KERNEL_STAT_H
-#include <asm/irq.h>
#include <linux/smp.h>
#include <linux/threads.h>
#include <linux/percpu.h>
#include <linux/cpumask.h>
+#include <asm/irq.h>
#include <asm/cputime.h>
/*
OpenPOWER on IntegriCloud