From 1d2d0a4cf61800b092c19fe079909cba3772fd84 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 4 Feb 2011 17:33:49 +0100
Subject: [PATCH] --- yaml --- r: 234688 b: refs/heads/master c:
 44951a60ff888add9e84f509ffce20052e45af94 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/kernel/irq/irqdesc.c | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index da54422118ba..2f5b0460f45b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c305d524e5dd3c3c7a6035083e30950bea1b52dc
+refs/heads/master: 44951a60ff888add9e84f509ffce20052e45af94
diff --git a/trunk/kernel/irq/irqdesc.c b/trunk/kernel/irq/irqdesc.c
index 282f20230e67..a7ac6e1e7074 100644
--- a/trunk/kernel/irq/irqdesc.c
+++ b/trunk/kernel/irq/irqdesc.c
@@ -251,7 +251,6 @@ int __init early_irq_init(void)
 	for (i = 0; i < count; i++) {
 		desc[i].irq_data.irq = i;
 		desc[i].irq_data.chip = &no_irq_chip;
-		/* TODO : do this allocation on-demand ... */
 		desc[i].kstat_irqs = alloc_percpu(unsigned int);
 		alloc_masks(desc + i, GFP_KERNEL, node);
 		desc_smp_init(desc + i, node);
@@ -277,22 +276,6 @@ static void free_desc(unsigned int irq)
 
 static inline int alloc_descs(unsigned int start, unsigned int cnt, int node)
 {
-#if defined(CONFIG_KSTAT_IRQS_ONDEMAND)
-	struct irq_desc *desc;
-	unsigned int i;
-
-	for (i = 0; i < cnt; i++) {
-		desc = irq_to_desc(start + i);
-		if (desc && !desc->kstat_irqs) {
-			unsigned int __percpu *stats = alloc_percpu(unsigned int);
-
-			if (!stats)
-				return -1;
-			if (cmpxchg(&desc->kstat_irqs, NULL, stats) != NULL)
-				free_percpu(stats);
-		}
-	}
-#endif
 	return start;
 }
 #endif /* !CONFIG_SPARSE_IRQ */