1 files changed, 4 insertions, 5 deletions

diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index d46de1f0f3ee..3981ae4cb58e 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -508,9 +508,8 @@ static void __init mpic_scan_ht_pics(struct mpic *mpic)
         printk(KERN_INFO "mpic: Setting up HT PICs workarounds for U3/U4\n");
 
         /* Allocate fixups array */
-        mpic->fixups = alloc_bootmem(128 * sizeof(struct mpic_irq_fixup));
+        mpic->fixups = kzalloc(128 * sizeof(*mpic->fixups), GFP_KERNEL);
         BUG_ON(mpic->fixups == NULL);
-        memset(mpic->fixups, 0, 128 * sizeof(struct mpic_irq_fixup));
 
         /* Init spinlock */
         spin_lock_init(&mpic->fixup_lock);
@@ -1109,9 +1108,8 @@ struct mpic * __init mpic_alloc(struct device_node *node,
                         psize /= 4;
                         bits = intvec_top + 1;
                         mapsize = BITS_TO_LONGS(bits) * sizeof(unsigned long);
-                        mpic->protected = alloc_bootmem(mapsize);
+                        mpic->protected = kzalloc(mapsize, GFP_KERNEL);
                         BUG_ON(mpic->protected == NULL);
-                        memset(mpic->protected, 0, mapsize);
                         for (i = 0; i < psize; i++) {
                                 if (psrc[i] > intvec_top)
                                         continue;
@@ -1353,7 +1351,8 @@ void __init mpic_init(struct mpic *mpic)
 
 #ifdef CONFIG_PM
         /* allocate memory to save mpic state */
-        mpic->save_data = alloc_bootmem(mpic->num_sources * sizeof(struct mpic_irq_save));
+        mpic->save_data = kmalloc(mpic->num_sources * sizeof(*mpic->save_data),
+                                  GFP_KERNEL);
         BUG_ON(mpic->save_data == NULL);
 #endif
 }