From b7e439dd74034dd727d022cc2be06dacca6ef295 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Thu, 18 Jun 2009 22:01:20 +0000
Subject: [PATCH] --- yaml --- r: 154395 b: refs/heads/master c:
 85355bb272db31a3f2dd99d547eef794805e1319 h: refs/heads/master i:   154393:
 3baf0dcd58f3517c139953cb7ea8af9883528700   154391:
 267edb312dadbba366abf96247c5214b499a48c8 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/sysdev/mpic.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3fe9cb9c43b7..5c7567dcc62a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2367194183d6ab6b05e5d7d9b40db6ba48afc06
+refs/heads/master: 85355bb272db31a3f2dd99d547eef794805e1319
diff --git a/trunk/arch/powerpc/sysdev/mpic.c b/trunk/arch/powerpc/sysdev/mpic.c
index 32a2e950f563..d46de1f0f3ee 100644
--- a/trunk/arch/powerpc/sysdev/mpic.c
+++ b/trunk/arch/powerpc/sysdev/mpic.c
@@ -1053,11 +1053,10 @@ struct mpic * __init mpic_alloc(struct device_node *node,
 	int		intvec_top;
 	u64		paddr = phys_addr;
 
-	mpic = alloc_bootmem(sizeof(struct mpic));
+	mpic = kzalloc(sizeof(struct mpic), GFP_KERNEL);
 	if (mpic == NULL)
 		return NULL;
-	
-	memset(mpic, 0, sizeof(struct mpic));
+
 	mpic->name = name;
 
 	mpic->hc_irq = mpic_irq_chip;