aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/handle.c
diff options
context:
space:
mode:
authorMike Travis <travis@sgi.com>2009-01-11 01:24:07 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-11 13:13:42 -0500
commit542d865bbed4ce1f050f586e53cf1cfadda93766 (patch)
tree73ed6c9ef7cf7defbcc50a210aafbf1d7d914f7a /kernel/irq/handle.c
parent9332fccdedf8e09448f3b69b624211ae879f6c45 (diff)
kstat: modify kstat_irqs_legacy to be variable sized
Impact: reduce memory usage. Allocate kstat_irqs_legacy based on nr_cpu_ids to deal with this memory usage bump when NR_CPUS bumped from 128 to 4096: 8192 +253952 262144 +3100% kstat_irqs_legacy(.bss) This is only when CONFIG_SPARSE_IRQS=y. Signed-off-by: Mike Travis <travis@sgi.com>
Diffstat (limited to 'kernel/irq/handle.c')
-rw-r--r--kernel/irq/handle.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index ebba7a116f14..b39f32ac8f80 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -124,8 +124,7 @@ static struct irq_desc irq_desc_legacy[NR_IRQS_LEGACY] __cacheline_aligned_in_sm
124 } 124 }
125}; 125};
126 126
127/* FIXME: use bootmem alloc ...*/ 127static unsigned int *kstat_irqs_legacy;
128static unsigned int kstat_irqs_legacy[NR_IRQS_LEGACY][NR_CPUS];
129 128
130int __init early_irq_init(void) 129int __init early_irq_init(void)
131{ 130{
@@ -144,9 +143,14 @@ int __init early_irq_init(void)
144 /* allocate irq_desc_ptrs array based on nr_irqs */ 143 /* allocate irq_desc_ptrs array based on nr_irqs */
145 irq_desc_ptrs = alloc_bootmem(nr_irqs * sizeof(void *)); 144 irq_desc_ptrs = alloc_bootmem(nr_irqs * sizeof(void *));
146 145
146 /* allocate based on nr_cpu_ids */
147 /* FIXME: invert kstat_irgs, and it'd be a per_cpu_alloc'd thing */
148 kstat_irqs_legacy = alloc_bootmem(NR_IRQS_LEGACY * nr_cpu_ids *
149 sizeof(int));
150
147 for (i = 0; i < legacy_count; i++) { 151 for (i = 0; i < legacy_count; i++) {
148 desc[i].irq = i; 152 desc[i].irq = i;
149 desc[i].kstat_irqs = kstat_irqs_legacy[i]; 153 desc[i].kstat_irqs = kstat_irqs_legacy + i * nr_cpu_ids;
150 lockdep_set_class(&desc[i].lock, &irq_desc_lock_class); 154 lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);
151 init_alloc_desc_masks(&desc[i], 0, true); 155 init_alloc_desc_masks(&desc[i], 0, true);
152 irq_desc_ptrs[i] = desc + i; 156 irq_desc_ptrs[i] = desc + i;