summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJeremy Kerr <jeremy.kerr@canonical.com>2010-02-14 07:13:47 -0700
committerGrant Likely <grant.likely@secretlab.ca>2010-02-14 07:13:47 -0700
commit4ef7b373df330bc0ff037dc4792d373c9346375f (patch)
tree5e0daa974d6de7b96c95d990cbc191085ec80349 /drivers
parent9dfbf207802c7e8cda9d081a8d750b50633c82d2 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/of/fdt.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index b51f797d9d9d..406757a9d7ea 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);