Merge commit 'v2.6.31-rc7' into x86/cleanups

Merge reason: we were on -rc1 before - go up to -rc7

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index a86d3ce01ead..69e2630c9062 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -728,12 +728,10 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
         if (ret)
                 return NULL;
 
-        ipic = alloc_bootmem(sizeof(struct ipic));
+        ipic = kzalloc(sizeof(*ipic), GFP_KERNEL);
         if (ipic == NULL)
                 return NULL;
 
-        memset(ipic, 0, sizeof(struct ipic));
-
         ipic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
                                        NR_IPIC_INTS,
                                        &ipic_host_ops, 0);