From 77a03d9c33c7851f635dd1d32fc58fd2790265d2 Mon Sep 17 00:00:00 2001
From: Mike Travis <travis@sgi.com>
Date: Sat, 10 Jan 2009 22:24:07 -0800
Subject: [PATCH] --- yaml --- r: 136383 b: refs/heads/master c:
 542d865bbed4ce1f050f586e53cf1cfadda93766 h: refs/heads/master i:   136381:
 c15d4d6d95dc85dced59a11af1d9720c25b570d2   136379:
 cc11ea876906f0e4879e483ed9e4c0dbf3d071ae   136375:
 ec20bc371730f7e32091b777cff313331f58f05a   136367:
 7073e3991cfa6d9d73ea3e20bd3295efc7be87ab   136351:
 e17dafdcfee3f4e27be083183f6e408636a83147   136319:
 88eccf2938b7ea502d7ebe109bc6442bab3c9713 v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/irq/handle.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index be665b10ed61..c8b727cab4f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9332fccdedf8e09448f3b69b624211ae879f6c45
+refs/heads/master: 542d865bbed4ce1f050f586e53cf1cfadda93766
diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c
index ebba7a116f14..b39f32ac8f80 100644
--- a/trunk/kernel/irq/handle.c
+++ b/trunk/kernel/irq/handle.c
@@ -124,8 +124,7 @@ static struct irq_desc irq_desc_legacy[NR_IRQS_LEGACY] __cacheline_aligned_in_sm
 	}
 };
 
-/* FIXME: use bootmem alloc ...*/
-static unsigned int kstat_irqs_legacy[NR_IRQS_LEGACY][NR_CPUS];
+static unsigned int *kstat_irqs_legacy;
 
 int __init early_irq_init(void)
 {
@@ -144,9 +143,14 @@ int __init early_irq_init(void)
 	/* allocate irq_desc_ptrs array based on nr_irqs */
 	irq_desc_ptrs = alloc_bootmem(nr_irqs * sizeof(void *));
 
+	/* allocate based on nr_cpu_ids */
+	/* FIXME: invert kstat_irgs, and it'd be a per_cpu_alloc'd thing */
+	kstat_irqs_legacy = alloc_bootmem(NR_IRQS_LEGACY * nr_cpu_ids *
+					  sizeof(int));
+
 	for (i = 0; i < legacy_count; i++) {
 		desc[i].irq = i;
-		desc[i].kstat_irqs = kstat_irqs_legacy[i];
+		desc[i].kstat_irqs = kstat_irqs_legacy + i * nr_cpu_ids;
 		lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);
 		init_alloc_desc_masks(&desc[i], 0, true);
 		irq_desc_ptrs[i] = desc + i;