3 files changed, 3 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/powermac/nvram.c b/arch/powerpc/platforms/powermac/nvram.c
index 014d06e6d46b..60b03a1703d1 100644
--- a/arch/powerpc/platforms/powermac/nvram.c
+++ b/arch/powerpc/platforms/powermac/nvram.c
@@ -513,11 +513,7 @@ static int __init core99_nvram_setup(struct device_node *dp, unsigned long addr)
                 printk(KERN_ERR "nvram: no address\n");
                 return -EINVAL;
         }
-        nvram_image = alloc_bootmem(NVRAM_SIZE);
-        if (nvram_image == NULL) {
-                printk(KERN_ERR "nvram: can't allocate ram image\n");
-                return -ENOMEM;
-        }
+        nvram_image = memblock_virt_alloc(NVRAM_SIZE, 0);
         nvram_data = ioremap(addr, NVRAM_SIZE*2);
         nvram_naddrs = 1; /* Make sure we get the correct case */
 
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 7e868ccf3b0d..04702db35d45 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -15,7 +15,6 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
 #include <linux/irq.h>
 #include <linux/of_pci.h>
 
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index b127a29ac526..713d36d45d1d 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -632,6 +632,8 @@ static int __init pmac_probe(void)
         smu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);
 #endif /* CONFIG_PMAC_SMU */
 
+        pm_power_off = pmac_power_off;
+
         return 1;
 }
 
@@ -663,7 +665,6 @@ define_machine(powermac) {
         .get_irq                = NULL, /* changed later */
         .pci_irq_fixup          = pmac_pci_irq_fixup,
         .restart                = pmac_restart,
-        .power_off              = pmac_power_off,
         .halt                   = pmac_halt,
         .time_init              = pmac_time_init,
         .get_boot_time          = pmac_get_boot_time,