aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorJeremy Kerr <jeremy.kerr@canonical.com>2010-02-14 09:13:47 -0500
committerGrant Likely <grant.likely@secretlab.ca>2010-02-14 09:13:47 -0500
commit4ef7b373df330bc0ff037dc4792d373c9346375f (patch)
tree5e0daa974d6de7b96c95d990cbc191085ec80349 /arch/microblaze
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 'arch/microblaze')
-rw-r--r--arch/microblaze/kernel/prom.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index 050b7993c51c..a7dcaf092200 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -55,6 +55,11 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
55 lmb_add(base, size); 55 lmb_add(base, size);
56} 56}
57 57
58u64 __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
59{
60 return lmb_alloc(size, align);
61}
62
58#ifdef CONFIG_EARLY_PRINTK 63#ifdef CONFIG_EARLY_PRINTK
59/* MS this is Microblaze specifig function */ 64/* MS this is Microblaze specifig function */
60static int __init early_init_dt_scan_serial(unsigned long node, 65static int __init early_init_dt_scan_serial(unsigned long node,