2 files changed, 3 insertions, 12 deletions

diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index 296b5268754e..5e0a191764fc 100644
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -122,8 +122,8 @@ static int __init cbe_ptcal_enable_on_node(int nid, int order)
 
         area->nid = nid;
         area->order = order;
-        area->pages = alloc_pages_node(area->nid, GFP_KERNEL | GFP_THISNODE,
-                                        area->order);
+        area->pages = alloc_pages_exact_node(area->nid, GFP_KERNEL|GFP_THISNODE,
+                                                area->order);
 
         if (!area->pages) {
                 printk(KERN_WARNING "%s: no page on node %d\n",
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 9abd210d87c1..8547e86bfb42 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -752,17 +752,8 @@ static int __init init_spu_base(void)
                 goto out_unregister_sysdev_class;
         }
 
-        if (ret > 0) {
-                /*
-                 * We cannot put the forward declaration in
-                 * <linux/linux_logo.h> because of conflicting session type
-                 * conflicts for const and __initdata with different compiler
-                 * versions
-                 */
-                extern const struct linux_logo logo_spe_clut224;
-
+        if (ret > 0)
                 fb_append_extra_logo(&logo_spe_clut224, ret);
-        }
 
         mutex_lock(&spu_full_list_mutex);
         xmon_register_spus(&spu_full_list);