of/flattree: Don't assume HAVE_LMB

We don't always have lmb available, so make arches provide an
early_init_dt_alloc_memory_arch() to handle the allocation of
memory in the fdt code.

When we don't have lmb.h included, we need asm/page.h for __va.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Michal Simek <monstr@monstr.eu>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index b51f797d9d9..406757a9d7e 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -10,16 +10,18 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/lmb.h>
 #include <linux/initrd.h>
 #include <linux/of.h>
 #include <linux/of_fdt.h>
-
+#include <linux/string.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_PPC
 #include <asm/machdep.h>
 #endif /* CONFIG_PPC */
 
+#include <asm/page.h>
+
 int __initdata dt_root_addr_cells;
 int __initdata dt_root_size_cells;
 
@@ -560,7 +562,8 @@ void __init unflatten_device_tree(void)
         pr_debug("  size is %lx, allocating...\n", size);
 
         /* Allocate memory for the expanded device tree */
-        mem = lmb_alloc(size + 4, __alignof__(struct device_node));
+        mem = early_init_dt_alloc_memory_arch(size + 4,
+                        __alignof__(struct device_node));
         mem = (unsigned long) __va(mem);
 
         ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef);