From b75d13a41a6c18806682dab653e7c08c3d01a3b8 Mon Sep 17 00:00:00 2001
From: Milton Miller <miltonm@bga.com>
Date: Tue, 24 May 2011 20:34:17 +0000
Subject: [PATCH] --- yaml --- r: 251826 b: refs/heads/master c:
 3d1b5e206a4f0ce46f2aa138590738c5d8e118ac h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/powerpc/kernel/irq.c | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index f705c3f50afe..465b5c87c790 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8142f032a90680ed2fb080ca694ffe9509276361
+refs/heads/master: 3d1b5e206a4f0ce46f2aa138590738c5d8e118ac
diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c
index f2fd6539d8bf..0df255414836 100644
--- a/trunk/arch/powerpc/kernel/irq.c
+++ b/trunk/arch/powerpc/kernel/irq.c
@@ -557,15 +557,8 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
 	if (revmap_type == IRQ_HOST_MAP_LEGACY) {
 		if (irq_map[0].host != NULL) {
 			raw_spin_unlock_irqrestore(&irq_big_lock, flags);
-			/* If we are early boot, we can't free the structure,
-			 * too bad...
-			 * this will be fixed once slab is made available early
-			 * instead of the current cruft
-			 */
-			if (mem_init_done) {
-				of_node_put(host->of_node);
-				kfree(host);
-			}
+			of_node_put(host->of_node);
+			kfree(host);
 			return NULL;
 		}
 		irq_map[0].host = host;