Merge branch 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  lmb: rename to memblock

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index c8b96ed7c015..559db2b846a9 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -36,7 +36,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/vmalloc.h>
 #include <linux/suspend.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 #include <linux/gfp.h>
 #include <asm/io.h>
 #include <asm/prom.h>
@@ -232,7 +232,7 @@ static int __init dart_init(struct device_node *dart_node)
          * that to work around what looks like a problem with the HT bridge
          * prefetching into invalid pages and corrupting data
          */
-        tmp = lmb_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE);
+        tmp = memblock_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE);
         dart_emptyval = DARTMAP_VALID | ((tmp >> DART_PAGE_SHIFT) &
                                          DARTMAP_RPNMASK);
 
@@ -407,7 +407,7 @@ void __init alloc_dart_table(void)
         if (iommu_is_off)
                 return;
 
-        if (!iommu_force_on && lmb_end_of_DRAM() <= 0x40000000ull)
+        if (!iommu_force_on && memblock_end_of_DRAM() <= 0x40000000ull)
                 return;
 
         /* 512 pages (2MB) is max DART tablesize. */
@@ -416,7 +416,7 @@ void __init alloc_dart_table(void)
          * will blow up an entire large page anyway in the kernel mapping
          */
         dart_tablebase = (unsigned long)
-                abs_to_virt(lmb_alloc_base(1UL<<24, 1UL<<24, 0x80000000L));
+                abs_to_virt(memblock_alloc_base(1UL<<24, 1UL<<24, 0x80000000L));
 
         printk(KERN_INFO "DART table allocated at: %lx\n", dart_tablebase);
 }