diff options
author | Jeremy Kerr <jeremy.kerr@canonical.com> | 2010-02-14 09:13:47 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-14 09:13:47 -0500 |
commit | 4ef7b373df330bc0ff037dc4792d373c9346375f (patch) | |
tree | 5e0daa974d6de7b96c95d990cbc191085ec80349 /include/linux | |
parent | 9dfbf207802c7e8cda9d081a8d750b50633c82d2 (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 'include/linux')
-rw-r--r-- | include/linux/of_fdt.h | 1 |
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); | |||
78 | extern int early_init_dt_scan_memory(unsigned long node, const char *uname, | 78 | extern int early_init_dt_scan_memory(unsigned long node, const char *uname, |
79 | int depth, void *data); | 79 | int depth, void *data); |
80 | extern void early_init_dt_add_memory_arch(u64 base, u64 size); | 80 | extern void early_init_dt_add_memory_arch(u64 base, u64 size); |
81 | extern u64 early_init_dt_alloc_memory_arch(u64 size, u64 align); | ||
81 | extern u64 dt_mem_next_cell(int s, __be32 **cellp); | 82 | extern u64 dt_mem_next_cell(int s, __be32 **cellp); |
82 | 83 | ||
83 | /* | 84 | /* |