Merge commit 'gcl/next' into next

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index 47905c092861..dd6c141f1662 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -12,7 +12,7 @@
 #include <linux/kexec.h>
 #include <linux/reboot.h>
 #include <linux/threads.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 #include <linux/of.h>
 #include <asm/machdep.h>
 #include <asm/prom.h>
@@ -78,11 +78,11 @@ void __init reserve_crashkernel(void)
         unsigned long long crash_size, crash_base;
         int ret;
 
-        /* this is necessary because of lmb_phys_mem_size() */
-        lmb_analyze();
+        /* this is necessary because of memblock_phys_mem_size() */
+        memblock_analyze();
 
         /* use common parsing */
-        ret = parse_crashkernel(boot_command_line, lmb_phys_mem_size(),
+        ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
                         &crash_size, &crash_base);
         if (ret == 0 && crash_size > 0) {
                 crashk_res.start = crash_base;
@@ -145,9 +145,9 @@ void __init reserve_crashkernel(void)
                         "for crashkernel (System RAM: %ldMB)\n",
                         (unsigned long)(crash_size >> 20),
                         (unsigned long)(crashk_res.start >> 20),
-                        (unsigned long)(lmb_phys_mem_size() >> 20));
+                        (unsigned long)(memblock_phys_mem_size() >> 20));
 
-        lmb_reserve(crashk_res.start, crash_size);
+        memblock_reserve(crashk_res.start, crash_size);
 }
 
 int overlaps_crashkernel(unsigned long start, unsigned long size)