summaryrefslogtreecommitdiffstats
path: root/include
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 /include
parent9dfbf207802c7e8cda9d081a8d750b50633c82d2 (diff)
downloadblackbird-obmc-linux-4ef7b373df330bc0ff037dc4792d373c9346375f.tar.gz
blackbird-obmc-linux-4ef7b373df330bc0ff037dc4792d373c9346375f.zip
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 'include')
-rw-r--r--include/linux/of_fdt.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index c9cb8a7bc065..a1ca92ccb0ff 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -78,6 +78,7 @@ extern void early_init_dt_check_for_initrd(unsigned long node);
extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
int depth, void *data);
extern void early_init_dt_add_memory_arch(u64 base, u64 size);
+extern u64 early_init_dt_alloc_memory_arch(u64 size, u64 align);
extern u64 dt_mem_next_cell(int s, __be32 **cellp);
/*
OpenPOWER on IntegriCloud