From 0d268ba117b38360fb313ed7aff8af38762eeb8b Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Oct 2007 13:37:53 +1000
Subject: [PATCH] --- yaml --- r: 67414 b: refs/heads/master c:
 5669c3cf19fbadaa9120b59914beec8431277efe h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/powerpc/kernel/irq.c    | 10 ++--------
 trunk/arch/powerpc/lib/alloc.c     | 15 +++++++++++++++
 trunk/include/asm-powerpc/system.h |  1 +
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 6ad3c39ce352..a024b1a502d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88de3cab98ff6c794b840969427e61605d0cc1ea
+refs/heads/master: 5669c3cf19fbadaa9120b59914beec8431277efe
diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c
index 0e47c8cfc979..151b13119208 100644
--- a/trunk/arch/powerpc/kernel/irq.c
+++ b/trunk/arch/powerpc/kernel/irq.c
@@ -424,7 +424,7 @@ static int default_irq_host_match(struct irq_host *h, struct device_node *np)
 	return h->of_node != NULL && h->of_node == np;
 }
 
-__init_refok struct irq_host *irq_alloc_host(struct device_node *of_node,
+struct irq_host *irq_alloc_host(struct device_node *of_node,
 				unsigned int revmap_type,
 				unsigned int revmap_arg,
 				struct irq_host_ops *ops,
@@ -439,13 +439,7 @@ __init_refok struct irq_host *irq_alloc_host(struct device_node *of_node,
 	/* Allocate structure and revmap table if using linear mapping */
 	if (revmap_type == IRQ_HOST_MAP_LINEAR)
 		size += revmap_arg * sizeof(unsigned int);
-	if (mem_init_done)
-		host = kzalloc(size, GFP_KERNEL);
-	else {
-		host = alloc_bootmem(size);
-		if (host)
-			memset(host, 0, size);
-	}
+	host = zalloc_maybe_bootmem(size, GFP_KERNEL);
 	if (host == NULL)
 		return NULL;
 
diff --git a/trunk/arch/powerpc/lib/alloc.c b/trunk/arch/powerpc/lib/alloc.c
index e58c80590ebc..f53e09c7dac7 100644
--- a/trunk/arch/powerpc/lib/alloc.c
+++ b/trunk/arch/powerpc/lib/alloc.c
@@ -2,6 +2,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/bootmem.h>
+#include <linux/string.h>
 
 #include <asm/system.h>
 
@@ -12,3 +13,17 @@ void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask)
 	else
 		return alloc_bootmem(size);
 }
+
+void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask)
+{
+	void *p;
+
+	if (mem_init_done)
+		p = kzalloc(size, mask);
+	else {
+		p = alloc_bootmem(size);
+		if (p)
+			memset(p, 0, size);
+	}
+	return p;
+}
diff --git a/trunk/include/asm-powerpc/system.h b/trunk/include/asm-powerpc/system.h
index f7879fc530f1..d10e99bf5001 100644
--- a/trunk/include/asm-powerpc/system.h
+++ b/trunk/include/asm-powerpc/system.h
@@ -190,6 +190,7 @@ extern unsigned long memory_limit;
 extern unsigned long klimit;
 
 extern void *alloc_maybe_bootmem(size_t size, gfp_t mask);
+extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
 
 extern int powersave_nap;	/* set if nap mode can be used in idle loop */