1 files changed, 2 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 3f509f86432c..799c8580ab09 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -125,12 +125,7 @@ static void __init prealloc(struct ps3_prealloc *p)
         if (!p->size)
                 return;
 
-        p->address = __alloc_bootmem(p->size, p->align, __pa(MAX_DMA_ADDRESS));
-        if (!p->address) {
-                printk(KERN_ERR "%s: Cannot allocate %s\n", __func__,
-                       p->name);
-                return;
-        }
+        p->address = memblock_virt_alloc(p->size, p->align);
 
         printk(KERN_INFO "%s: %lu bytes at %p\n", p->name, p->size,
                p->address);
@@ -248,6 +243,7 @@ static int __init ps3_probe(void)
         ps3_mm_init();
         ps3_mm_vas_create(&htab_size);
         ps3_hpte_init(htab_size);
+        pm_power_off = ps3_power_off;
 
         DBG(" <- %s:%d\n", __func__, __LINE__);
         return 1;
@@ -278,7 +274,6 @@ define_machine(ps3) {
         .calibrate_decr                 = ps3_calibrate_decr,
         .progress                       = ps3_progress,
         .restart                        = ps3_restart,
-        .power_off                      = ps3_power_off,
         .halt                           = ps3_halt,
 #if defined(CONFIG_KEXEC)
         .kexec_cpu_down                 = ps3_kexec_cpu_down,